From ab7d1e2791b4815441704bf17485162a82c5a5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladimir=20T=C3=A1mara=20Pati=C3=B1o?= Date: Wed, 6 Mar 2024 10:55:26 -0500 Subject: [PATCH] Actualiza --- Gemfile.lock | 16 ++++---- bin/gc.sh | 2 +- bin/regresion.sh | 10 +++-- test/dummy/db/structure.sql | 80 +++++++++++++++++++++++++++++++++++-- test/dummy/yarn.lock | 30 +++++++------- 5 files changed, 106 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5f5a9d00..034bd414 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/heb412_gen.git - revision: efb0a43506f8cf5bc327ace436feaf0c32260d98 + revision: 54915abcbb7255f4399e44dcb76b05337dc0a212 branch: main specs: heb412_gen (2.2.0.beta4) @@ -29,7 +29,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/mr519_gen.git - revision: 257869ab3ba9ff0ec262a63309abac3e333f6769 + revision: db9aa814bfffe7a1a4636c65bda68eda7a3e3ecd branch: main specs: mr519_gen (2.2.0.beta4) @@ -38,10 +38,10 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/msip.git - revision: 3519bebab3cc88355c52f566c0d0b5eb624e0514 + revision: 306d12415001b3626cace575bb6c9eed006e3fef branch: main specs: - msip (2.2.0.beta4) + msip (2.2.0.beta5) cancancan (~> 3) devise (~> 4) devise-i18n (~> 1) @@ -286,7 +286,7 @@ GEM racc parslet (2.0.0) pdf-core (0.9.0) - pg (1.5.4) + pg (1.5.6) prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) @@ -386,7 +386,7 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-shopify (2.14.0) + rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-graphviz (1.2.5) rexml @@ -422,11 +422,11 @@ GEM stringio (3.1.0) terrapin (1.0.1) climate_control - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) timeout (0.4.1) ttfunk (1.7.0) - turbo-rails (2.0.2) + turbo-rails (2.0.4) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/bin/gc.sh b/bin/gc.sh index b83bf773..41729a4e 100755 --- a/bin/gc.sh +++ b/bin/gc.sh @@ -40,7 +40,7 @@ if (test "$SINAC" != "1") then { echo "Eliminando $rutapore/*" rm -rf $rutapore/* } fi; - NOKOGIRI_USE_SYSTEM_LIBRARIES=1 MAKE=gmake make=gmake QMAKE=qmake4 bundle update + NOKOGIRI_USE_SYSTEM_LIBRARIES=1 MAKE=gmake make=gmake QMAKE=qmake4 bundle update --conservative NOKOGIRI_USE_SYSTEM_LIBRARIES=1 MAKE=gmake make=gmake QMAKE=qmake4 bundle update --bundler if (test "$?" != "0") then { exit 1; diff --git a/bin/regresion.sh b/bin/regresion.sh index d23b5b64..56e99840 100755 --- a/bin/regresion.sh +++ b/bin/regresion.sh @@ -54,10 +54,12 @@ if (test "$?" != "0") then { } fi; -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; +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" diff --git a/test/dummy/db/structure.sql b/test/dummy/db/structure.sql index c06db734..7ca567e4 100644 --- a/test/dummy/db/structure.sql +++ b/test/dummy/db/structure.sql @@ -2990,6 +2990,42 @@ CREATE SEQUENCE public.msip_etiqueta_persona_id_seq ALTER SEQUENCE public.msip_etiqueta_persona_id_seq OWNED BY public.msip_etiqueta_persona.id; +-- +-- Name: msip_etnia; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.msip_etnia ( + id bigint NOT NULL, + nombre character varying(500) NOT NULL COLLATE public.es_co_utf_8, + descripcion character varying(1000), + observaciones character varying(5000), + fechacreacion date NOT NULL, + fechadeshabilitacion date, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL, + CONSTRAINT etnia_check CHECK (((fechadeshabilitacion IS NULL) OR (fechadeshabilitacion >= fechacreacion))) +); + + +-- +-- Name: msip_etnia_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.msip_etnia_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: msip_etnia_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.msip_etnia_id_seq OWNED BY public.msip_etnia.id; + + -- -- Name: msip_fuenteprensa; Type: TABLE; Schema: public; Owner: - -- @@ -3163,11 +3199,11 @@ UNION -- CREATE MATERIALIZED VIEW public.msip_mundep AS - SELECT msip_mundep_sinorden.idlocal, - msip_mundep_sinorden.nombre, - to_tsvector('spanish'::regconfig, public.unaccent(msip_mundep_sinorden.nombre)) AS mundep + SELECT idlocal, + nombre, + to_tsvector('spanish'::regconfig, public.unaccent(nombre)) AS mundep FROM public.msip_mundep_sinorden - ORDER BY (msip_mundep_sinorden.nombre COLLATE public.es_co_utf_8) + ORDER BY (nombre COLLATE public.es_co_utf_8) WITH NO DATA; @@ -3474,6 +3510,7 @@ CREATE TABLE public.msip_persona ( departamento_id integer, municipio_id integer, centropoblado_id integer, + etnia_id integer DEFAULT 1 NOT NULL, CONSTRAINT persona_check CHECK (((dianac IS NULL) OR (((dianac >= 1) AND (((mesnac = 1) OR (mesnac = 3) OR (mesnac = 5) OR (mesnac = 7) OR (mesnac = 8) OR (mesnac = 10) OR (mesnac = 12)) AND (dianac <= 31))) OR (((mesnac = 4) OR (mesnac = 6) OR (mesnac = 9) OR (mesnac = 11)) AND (dianac <= 30)) OR ((mesnac = 2) AND (dianac <= 29))))), CONSTRAINT persona_mesnac_check CHECK (((mesnac IS NULL) OR ((mesnac >= 1) AND (mesnac <= 12)))), CONSTRAINT persona_sexo_check CHECK (((sexo = 'S'::bpchar) OR (sexo = 'F'::bpchar) OR (sexo = 'M'::bpchar))) @@ -4402,6 +4439,13 @@ ALTER TABLE ONLY public.msip_estadosol ALTER COLUMN id SET DEFAULT nextval('publ ALTER TABLE ONLY public.msip_etiqueta_persona ALTER COLUMN id SET DEFAULT nextval('public.msip_etiqueta_persona_id_seq'::regclass); +-- +-- Name: msip_etnia id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_etnia ALTER COLUMN id SET DEFAULT nextval('public.msip_etnia_id_seq'::regclass); + + -- -- Name: msip_fuenteprensa id; Type: DEFAULT; Schema: public; Owner: - -- @@ -5113,6 +5157,14 @@ ALTER TABLE ONLY public.msip_etiqueta ADD CONSTRAINT msip_etiqueta_pkey PRIMARY KEY (id); +-- +-- Name: msip_etnia msip_etnia_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_etnia + ADD CONSTRAINT msip_etnia_pkey PRIMARY KEY (id); + + -- -- Name: msip_fuenteprensa msip_fuenteprensa_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -5505,6 +5557,13 @@ CREATE INDEX index_msip_orgsocial_on_grupoper_id ON public.msip_orgsocial USING CREATE INDEX index_msip_orgsocial_on_pais_id ON public.msip_orgsocial USING btree (pais_id); +-- +-- Name: index_msip_persona_on_etnia_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_msip_persona_on_etnia_id ON public.msip_persona USING btree (etnia_id); + + -- -- Name: index_msip_solicitud_usuarionotificar_on_solicitud_id; Type: INDEX; Schema: public; Owner: - -- @@ -6648,6 +6707,14 @@ ALTER TABLE ONLY public.cor1440_gen_plantillahcm_proyectofinanciero ADD CONSTRAINT fk_rails_d56d245f70 FOREIGN KEY (proyectofinanciero_id) REFERENCES public.cor1440_gen_proyectofinanciero(id); +-- +-- Name: msip_persona fk_rails_d5b92f1c45; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.msip_persona + ADD CONSTRAINT fk_rails_d5b92f1c45 FOREIGN KEY (etnia_id) REFERENCES public.msip_etnia(id); + + -- -- Name: cor1440_gen_informe fk_rails_daf0af8605; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -7015,6 +7082,11 @@ ALTER TABLE ONLY public.usuario SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES +('20240221002426'), +('20240220164637'), +('20240220111410'), +('20240219221519'), +('20240219220944'), ('20231208162022'), ('20231205205600'), ('20231205205549'), diff --git a/test/dummy/yarn.lock b/test/dummy/yarn.lock index 6040102b..1483861d 100644 --- a/test/dummy/yarn.lock +++ b/test/dummy/yarn.lock @@ -25,9 +25,9 @@ js-tokens "^4.0.0" "@babel/runtime@^7.12.5": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" + integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== dependencies: regenerator-runtime "^0.14.0" @@ -206,9 +206,9 @@ ansi-styles@^3.2.1: color-convert "^1.9.0" apexcharts@^3.27.2: - version "3.45.2" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.45.2.tgz#18a6343da122c12d71ac9f35260aacd31b16fbfb" - integrity sha512-PpuM4sJWy70sUh5U1IFn1m1p45MdHSChLUNnqEoUUUHSU2IHZugFrsVNhov1S8Q0cvfdrCRCvdBtHGSs6PSAWQ== + version "3.46.0" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.46.0.tgz#ee0afd44a7df94e038c4cc0160ece21a0da387f5" + integrity sha512-ELAY6vj8JQD7QLktKasTzwm9Wt0qxqfQSo+3QWS7G7I774iK8HCkG1toGsqJH0mkK6PtYBtnSIe66uUcwoCw1w== dependencies: "@yr/monotone-cubic-spline" "^1.0.3" svg.draggable.js "^2.2.2" @@ -235,9 +235,9 @@ bootstrap-datepicker@^1.10.0: jquery ">=3.4.0 <4.0.0" bootstrap@^5.0.0: - version "5.3.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae" - integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g== + version "5.3.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" + integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== callsites@^3.0.0: version "3.1.0" @@ -323,9 +323,9 @@ escape-string-regexp@^1.0.5: integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== fast-xml-parser@^4.1.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz#385cc256ad7bbc57b91515a38a22502a9e1fca0d" - integrity sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA== + version "4.3.5" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.5.tgz#e2f2a2ae8377e9c3dc321b151e58f420ca7e5ccc" + integrity sha512-sWvP1Pl8H03B8oFJpFR3HE31HUfwtX7Rlf9BNsvdpujD4n7WMhfmu8h9wOV2u+c1k0ZilTADhPqypzx2J690ZQ== dependencies: strnum "^1.0.5" @@ -354,9 +354,9 @@ has-flag@^3.0.0: integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== dependencies: function-bind "^1.1.2"