Actualiza

pasosdeJesus · Feb 7, 2024 · 4e70193 · 4e70193
1 parent 98e34c2
commit 4e70193
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
-  revision: 1fb4ec862836e856151504f4084fb4701c1b990d
+  revision: efb0a43506f8cf5bc327ace436feaf0c32260d98
   branch: main
   specs:
     heb412_gen (2.2.0.beta4)
@@ -29,7 +29,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
-  revision: 895934c4f2b780b943cbd4a1aae6139f132cf32e
+  revision: 44446bcafef7dac19ac2a47c807950b10dbfe21a
   branch: main
   specs:
     mr519_gen (2.2.0.beta4)
@@ -38,7 +38,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/msip.git
-  revision: aa0e08be022d58340ed7b96bf45fc6d2487e6fac
+  revision: 0f184ae0dd0979cdd79328f2886b58b15c417e08
   branch: main
   specs:
     msip (2.2.0.beta4)
@@ -149,7 +149,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    brakeman (6.1.1)
+    brakeman (6.1.2)
       racc
     builder (3.2.4)
     bundler-audit (0.9.1)
@@ -243,18 +243,18 @@ GEM
     matrix (0.4.2)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0206)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.1)
     minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     msgpack (1.7.2)
     mutex_m (0.2.0)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -264,7 +264,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     odf-report (0.7.3)
@@ -442,7 +442,7 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   x86_64-openbsd
@@ -506,4 +506,4 @@ DEPENDENCIES
   will_paginate
 
 BUNDLED WITH
-   2.5.5
+   2.5.6
diff --git a/app/views/msip/personas/_familiar.html.erb b/app/views/msip/personas/_familiar.html.erb
@@ -28,8 +28,13 @@
       </div>
       <%= f.simple_fields_for :persona_trelacion1,
         child_index: params[:index] do |pt| %>
-        <%= render partial: 'msip/personas/persona_trelacion1_campos', 
-          locals: {f: pt, per: f, datalist: nombre_fuente_familiares } %>
+        <%= render partial: 'msip/personas/persona_familiar_campos', 
+          locals: {
+            f: pt, 
+            per: f, 
+            index_per: params[:index], 
+            datalist: nombre_fuente_familiares 
+          } %>
       <% end %>
     </div>
 

diff --git a/bin/regresion.sh b/bin/regresion.sh
@@ -47,30 +47,33 @@ if (test "$?" != "0") then {
 echo "== Pruebas de regresión unitarias"
 mkdir -p cobertura-unitarias/
 rm -rf cobertura-unitarias/{*,.*}
-CONFIG_HOSTS=www.example.com ${RAILS} test
+CONFIG_HOSTS=www.example.com RUTA_RELATIVA=/ ${RAILS} test
 if (test "$?" != "0") then {
   echo "No pasaron pruebas de regresión unitarias";
   exit 1;
 } fi;
 
-CONFIG_HOSTS=www.example.com bin/rails test `find test/integration -name "*rb" -type f`
-if (test "$?" != "0") then {
-  echo "No pasaron pruebas de integración";
-  exit 1;
+
+if (test -d test/integration) then {
+  CONFIG_HOSTS=www.example.com RUTA_RELATIVA=/ bin/rails test `find test/integration -name "*rb" -type f`
+  if (test "$?" != "0") then {
+    echo "No pasaron pruebas de integración";
+    exit 1;
+  } fi;
 } fi;
 
 echo "== Pruebas de regresión al sistema"
 mkdir -p $rutaap/cobertura-sistema/
 rm -rf $rutaap/cobertura-sistema/{*,.*}
 if (test "$CI" = "") then { # Por ahora no en gitlab-ci
-  (cd $rutaap; CONFIG_HOSTS=127.0.0.1 ${RAILS} msip:stimulus_motores test:system)
+  (cd $rutaap; RUTA_RELATIVA="/" CONFIG_HOSTS=127.0.0.1 ${RAILS} msip:stimulus_motores test:system &)
   if (test "$?" != "0") then {
     echo "No pasaron pruebas del sistema rails";
     exit 1;
   } fi;
 } fi;
 
-if (test -f $rutaap/bin/pruebasjs) then {
+if (test -f $rutaap/bin/pruebasjs -a "x$NOPRUEBAJS" != "x1") then {
   (cd $rutaap; CONFIG_HOSTS=127.0.0.1 ${RAILS} msip:stimulus_motores; bin/pruebasjs)
   if (test "$?" != "0") then {
     echo "No pasaron pruebas del sistema js";

diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -8,6 +8,8 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  config.relative_url_root="/" # Current test infrastructure doesn't support map from config.ru. Forced to have tests in / not in mount point.
+
   # While tests run files are not watched, reloading is not necessary.
   config.enable_reloading = false
 

diff --git a/test/dummy/yarn.lock b/test/dummy/yarn.lock
@@ -463,9 +463,9 @@ popper.js@^2.0.0-next.4:
   integrity sha512-rwX+OiRozGJyNzo+b39WE1yh1VE7+FuDAbMIP1j3hUQN4DP0WEOEbRlHC7dDgoIDpBQSm5rr+nCoPktbQCNhFQ==
 
 postcss@^8.2.10:
-  version "8.4.33"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
-  integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
+  version "8.4.34"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.34.tgz#563276e86b4ff20dfa5eed0d394d4c53853b2051"
+  integrity sha512-4eLTO36woPSocqZ1zIrFD2K1v6wH7pY1uBh0JIM2KKfrVtGvPFiAku6aNOP0W1Wr9qwnaCsF0Z+CrVnryB2A8Q==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.0"

diff --git a/test/helpers/msip/ubicacion_helper_test.rb b/test/helpers/msip/ubicacion_helper_test.rb
@@ -1,7 +1,6 @@
 
 require_relative '../../test_helper'
 require_relative '../../models/sivel2_gen/caso_test'
-require 'msip/ubicacion_helper'
 
 module Msip
   class UbicacionHelperTest < ActionView::TestCase