Merge pull request #1924 from alphagov/reorganise-and-fix-plugin-tests

Reorganise and fix plugin tests
alphagov · Jan 23, 2023 · 5f2a89e · 5f2a89e
2 parents d2cc61c + 9b3eae1
commit 5f2a89e
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 237 deletions.
diff --git a/.github/workflows/test-acceptance.yaml b/.github/workflows/test-acceptance.yaml
@@ -15,11 +15,11 @@ jobs:
       matrix:
         node-version: [18.x]
         os: [macos-latest, windows-latest, ubuntu-latest]
-        env: [smoke, dev, prod]
+        type: [smoke, plugins, dev, prod]
 
-    name: Acceptance ${{ matrix.env }} test kit on Node v${{ matrix.node-version }} (${{ matrix.os }})
+    name: Acceptance ${{ matrix.type }} test kit on Node v${{ matrix.node-version }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
+    timeout-minutes: 20
 
     env:
       CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
@@ -43,7 +43,7 @@ jobs:
 
     - run: npm ci
 
-    - run: npm run test:acceptance:${{ matrix.env }}
+    - run: npm run test:acceptance:${{ matrix.type }}
       env:
         CYPRESS_REQUEST_TIMEOUT: 20000
         CYPRESS_DEFAULT_COMMAND_TIMEOUT: 40000
@@ -53,6 +53,6 @@ jobs:
     - if: ${{ failure() }}
       uses: actions/upload-artifact@v3
       with:
-        name: cypress-screenshots-${{ matrix.env }}-${{ runner.os }}-${{ matrix.node-version }}
+        name: cypress-screenshots-${{ matrix.type }}-${{ runner.os }}-${{ matrix.node-version }}
         path: cypress/screenshots/
 
diff --git a/.github/workflows/test-download.yaml b/.github/workflows/test-download.yaml
diff --git a/.github/workflows/test-plugins.yaml b/.github/workflows/test-plugins.yaml
diff --git a/...ment-tests/change-service-name.cypress.js → ...ment-tests/change-service-name.cypress.js b/...ment-tests/change-service-name.cypress.js → ...ment-tests/change-service-name.cypress.js
diff --git a/...nagement-tests/clear-data-page.cypress.js → ...nagement-tests/clear-data-page.cypress.js b/...nagement-tests/clear-data-page.cypress.js → ...nagement-tests/clear-data-page.cypress.js
diff --git a/...anagement-tests/edit-home-page.cypress.js → ...anagement-tests/edit-home-page.cypress.js b/...anagement-tests/edit-home-page.cypress.js → ...anagement-tests/edit-home-page.cypress.js
diff --git a/...ent-tests/management-available.cypress.js → ...ent-tests/management-available.cypress.js b/...ent-tests/management-available.cypress.js → ...ent-tests/management-available.cypress.js
diff --git a/.../7-layout-tests/default-layout.cypress.js → .../6-layout-tests/default-layout.cypress.js b/.../7-layout-tests/default-layout.cypress.js → .../6-layout-tests/default-layout.cypress.js
diff --git a/cypress/e2e/dev/6-management-tests/create-new-page-from-template.cypress.js b/cypress/e2e/dev/6-management-tests/create-new-page-from-template.cypress.js
diff --git a/...ugin-tests/install-plugin-test.cypress.js → ...ugin-tests/install-plugin-test.cypress.js b/...ugin-tests/install-plugin-test.cypress.js → ...ugin-tests/install-plugin-test.cypress.js
diff --git a/...sts/multi-combined-plugin-test.cypress.js → ...sts/multi-combined-plugin-test.cypress.js b/...sts/multi-combined-plugin-test.cypress.js → ...sts/multi-combined-plugin-test.cypress.js
diff --git a/...plugin-tests/multi-plugin-test.cypress.js → ...plugin-tests/multi-plugin-test.cypress.js b/...plugin-tests/multi-plugin-test.cypress.js → ...plugin-tests/multi-plugin-test.cypress.js
diff --git a/...lugin-tests/single-plugin-test.cypress.js → ...lugin-tests/single-plugin-test.cypress.js b/...lugin-tests/single-plugin-test.cypress.js → ...lugin-tests/single-plugin-test.cypress.js
diff --git a/...tests/install-available-plugin.cypress.js → ...tests/install-available-plugin.cypress.js b/...tests/install-available-plugin.cypress.js → ...tests/install-available-plugin.cypress.js
@@ -139,7 +139,7 @@ describe('Management plugins: ', () => {
     cy.get('a[href*="/templates"]')
       .should('contains.text', 'Templates').click()
 
-    cy.get('h2').eq(2).should('contain.text', pluginName)
+    cy.get('h2').contains(pluginName)
 
     cy.task('log', `Create a new ${pluginPageTitle} page`)
 
@@ -150,8 +150,7 @@ describe('Management plugins: ', () => {
       .should('contains.text', `Create new ${pluginPageTitle} page`)
     cy.get('#chosen-url')
       .type(pluginPagePath)
-    cy.get('.govuk-button')
-      .should('contains.text', 'Create page').click()
+    cy.get('.govuk-button').contains('Create page').click()
 
     provePluginFunctionalityWorks()
   })
@@ -217,8 +216,7 @@ describe('Management plugins: ', () => {
         const pkg = 'invalid-prototype-kit-plugin'
         const pluginName = 'Invalid Prototype Kit Plugin'
         cy.visit(`${managePluginsPagePath}/install?package=${encodeURIComponent(pkg)}`)
-        cy.get('h2')
-          .should('contains.text', `Install ${pluginName}`)
+        cy.get('h2').contains(`Install ${pluginName}`)
         failAction()
       })
 

diff --git a/...nt-tests/preview-template-view.cypress.js → ...ns-tests/preview-template-view.cypress.js b/...nt-tests/preview-template-view.cypress.js → ...ns-tests/preview-template-view.cypress.js
@@ -25,7 +25,7 @@ describe('Management plugins: ', () => {
   })
 
   it(`Preview a ${plugin}${version2} template`, () => {
-    cy.get('h2').eq(2).should('contain.text', pluginName)
+    cy.get('h2').contains(pluginName)
 
     cy.task('log', `Preview the ${pluginPageTitle} template`)
 

diff --git a/cypress/e2e/smoke/0-smoke-tests/index-page.cypress.js b/cypress/e2e/smoke/0-smoke-tests/index-page.cypress.js
@@ -1,6 +1,6 @@
 specify('index page', () => {
   cy.visit('/')
-  cy.contains('GOV.UK Prototype Kit')
+  cy.get('h2').contains('GOV.UK Prototype Kit')
 })
 
 specify('GOV.UK Frontend fonts loaded', () => {