diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js index 7a630ee75f..01e04801f1 100644 --- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js +++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js @@ -13,13 +13,13 @@ describe("when creating a project, the project page", () => { it("allows an admin user to create an EP project", () => { //add new - cy.fillAndCheckNewProjectForm("Emissions Performance", "2020"); + cy.fillAndCheckNewProjectForm("Emissions Performance", "2024"); cy.happoAndAxe("EP Project New Form", "filled", "main"); cy.findByRole("button", { name: /^confirm/i }).click(); // add overview cy.url().should("include", "/form/0"); - cy.findByText("Emissions Performance - 2020"); + cy.findByText("Emissions Performance - 2024"); cy.fillOverviewForm( "first operator legal name (AB1234567)", "Cement", @@ -176,7 +176,7 @@ describe("when creating a project, the project page", () => { // project overview section cy.findByText(/RFP Year ID/i) .next() - .should("have.text", "Emissions Performance - 2020"); + .should("have.text", "Emissions Performance - 2024"); cy.findByText(/Operator Name/i) .next() .should("have.text", "first operator legal name (AB1234567)"); diff --git a/app/cypress/e2e/cif/project-revision/undo-changes.cy.js b/app/cypress/e2e/cif/project-revision/undo-changes.cy.js index b625cab309..95cf2935e8 100644 --- a/app/cypress/e2e/cif/project-revision/undo-changes.cy.js +++ b/app/cypress/e2e/cif/project-revision/undo-changes.cy.js @@ -92,7 +92,7 @@ describe("when undoing, the project revision page", () => { }).click(); cy.addOrEditEmissionIntensityReport( "2022-01-01", - "2022-02-02", + "2022-04-02", "tCO", "1", "2", diff --git a/schema/deploy/tables/funding_stream_rfp_002.sql b/schema/deploy/tables/funding_stream_rfp_002.sql new file mode 100644 index 0000000000..d12a176e88 --- /dev/null +++ b/schema/deploy/tables/funding_stream_rfp_002.sql @@ -0,0 +1,9 @@ +-- Deploy cif:tables/funding_stream_rfp_002 to pg + + +begin; + +insert into cif.funding_stream_rfp (year, funding_stream_id) values +(2024, 1), (2024, 2); + +commit; diff --git a/schema/revert/tables/funding_stream_rfp_002.sql b/schema/revert/tables/funding_stream_rfp_002.sql new file mode 100644 index 0000000000..d88403cfc3 --- /dev/null +++ b/schema/revert/tables/funding_stream_rfp_002.sql @@ -0,0 +1,7 @@ +-- Revert cif:tables/funding_stream_rfp_002 from pg + +begin; + +delete from cif.funding_stream_rfp where year = 2024; + +commit; diff --git a/schema/sqitch.plan b/schema/sqitch.plan index 185492c0ef..bef95abbc9 100644 --- a/schema/sqitch.plan +++ b/schema/sqitch.plan @@ -374,3 +374,5 @@ mutations/commit_form_change [mutations/commit_form_change@1.15.0] 2023-11-22T19 @1.16.4 2024-05-15T17:36:42Z Mike Vesprini # release v1.16.4 @1.16.5 2024-05-22T23:00:27Z Mike Vesprini # release v1.16.5 @1.17.0 2024-05-24T21:29:42Z Mike Vesprini # release v1.17.0 + +tables/funding_stream_rfp_002 2024-05-28T22:41:57Z Brianna Cerkiewicz # Add 2024 funding streams values to funding_stream_rfp table diff --git a/schema/test/unit/tables/funding_stream_rfp_test.sql b/schema/test/unit/tables/funding_stream_rfp_test.sql index cddca0e789..246a9d70ed 100644 --- a/schema/test/unit/tables/funding_stream_rfp_test.sql +++ b/schema/test/unit/tables/funding_stream_rfp_test.sql @@ -67,7 +67,7 @@ select results_eq( $$ select count(*) from cif.funding_stream_rfp $$, - ARRAY['10'::bigint], + ARRAY['12'::bigint], 'cif_internal can view all data from funding_stream_rfp' ); diff --git a/schema/verify/tables/funding_stream_rfp_002.sql b/schema/verify/tables/funding_stream_rfp_002.sql new file mode 100644 index 0000000000..aeac37e065 --- /dev/null +++ b/schema/verify/tables/funding_stream_rfp_002.sql @@ -0,0 +1,13 @@ +-- Verify cif:tables/funding_stream_rfp_002 on pg + +begin; + +do $$ + begin + assert ( + (select count(*) from cif.funding_stream_rfp where year = 2024) = 2 + ), 'EP and IA streams have been added for 2024'; + end; +$$; + +rollback;