chore: use hardcoded dev version for running e2e prod tests (#3240)

* chore: use hardcoded dev version for running e2e prod tests * chore: consolidate visualization error test
dhis2 · Oct 8, 2024 · 04dee94 · 04dee94
1 parent 9ed1ebd
commit 04dee94
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
@@ -89,7 +89,7 @@ jobs:
     call-workflow-e2e-prod:
         if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
         needs: [build, lint, test, setup-matrix]
-        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master
+        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@feat/support-hardcoded-dev-version
         with:
             should_record: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record')}}
             spec-group: ${{ needs.setup-matrix.outputs.matrix }}

diff --git a/cypress/integration/customErrors/visualizationError.cy.js b/cypress/integration/customErrors/visualizationError.cy.js
@@ -33,49 +33,49 @@ const REGULAR_ITEM = {
 }
 
 describe('Visualization error', () => {
-    it('navigates to the start page and changes vis type to PT', () => {
+    it('displays an error when item is not valid for column chart', () => {
+        // navigate to the start page and change vis type to PT
         goToStartPage()
         changeVisType(visTypeDisplayNames[VIS_TYPE_PIVOT_TABLE])
-    })
-    it("selects period 'This year'", () => {
+
+        // select period 'This year'
         openDimension(DIMENSION_ID_PERIOD)
         unselectAllItemsByButton()
         selectRelativePeriods(['This year'], 'Years')
         clickDimensionModalUpdateButton()
-    })
-    it('selects a narrative item', () => {
+
+        // select a narrative item
         openDimension(DIMENSION_ID_DATA)
         inputSearchTerm('narrative')
         selectDataElements([NARRATIVE_ITEM.name])
         clickDimensionModalUpdateButton()
         expectVisualizationToBeVisible(VIS_TYPE_PIVOT_TABLE)
-    })
-    it('narrative item is displayed correctly', () => {
+
+        // narrative item is displayed correctly
         cy.contains(NARRATIVE_ITEM.content)
-    })
-    it('selects a regular item', () => {
+
+        // select a regular item
         openDimension(DIMENSION_ID_DATA)
         selectDataElements([REGULAR_ITEM.name])
         clickDimensionModalUpdateButton()
         expectVisualizationToBeVisible(VIS_TYPE_PIVOT_TABLE)
-    })
-    it('both items are displayed correctly', () => {
+
+        // both items are displayed correctly
         cy.contains(NARRATIVE_ITEM.content)
         cy.contains(REGULAR_ITEM.content)
-    })
 
-    it('changes vis type to Column', () => {
+        // change vis type to Column
         changeVisType(visTypeDisplayNames[VIS_TYPE_COLUMN])
-    })
-    it('regular item is displayed correctly', () => {
+
+        // regular item is displayed correctly
         cy.contains(REGULAR_ITEM.content)
-    })
-    it('removes the regular item', () => {
+
+        // remove the regular item
         openDimension(DIMENSION_ID_DATA)
         unselectItemByDoubleClick(REGULAR_ITEM.name)
         clickDimensionModalUpdateButton()
-    })
-    it('error is shown', () => {
+
+        // error is shown
         expectErrorToContainTitle('Invalid data type')
     })
 })