Added readme.md to the e2e directory, edited naming conventions and c…

…onfigurations accordingly, and added skip actions to incomplete tests.

cypress.config.js

@@ -19,8 +19,8 @@ module.exports = defineConfig({
     },
     supportFile: false,
     specPattern: [
-      'tests/cypress/accessibility-tests/**/*.cy.js',
-      'tests/cypress/template-tests/**/*.cy.js',
+      'tests/cypress/accessibility/**/*.cy.js',
+      'tests/cypress/template/**/*.cy.js',
       'tests/cypress/e2e/**/*.cy.js'
     ]
   }

package.json

@@ -1,15 +1,15 @@
 {
   "scripts": {
     "test-accessibility-gui-all": "npx cypress open",
-    "test-accessibility-cli-all": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/*'",
-    "test-accessibility-cli-about": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-about.cy.js'",
-    "test-accessibility-cli-concept": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-concept.cy.js'",
-    "test-accessibility-cli-feedback": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-feedback.cy.js'",
-    "test-accessibility-cli-global-search": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-global-search.cy.js'",
-    "test-accessibility-cli-landing": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-landing.cy.js'",
-    "test-accessibility-cli-vocab": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-vocab.cy.js'",
-    "test-accessibility-cli-vocab-home": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-vocab-home.cy.js'",
-    "test-accessibility-cli-vocab-search": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility-tests/axe-vocab-search.cy.js'"
+    "test-accessibility-cli-all": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/*'",
+    "test-accessibility-cli-about": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-about.cy.js'",
+    "test-accessibility-cli-concept": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-concept.cy.js'",
+    "test-accessibility-cli-feedback": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-feedback.cy.js'",
+    "test-accessibility-cli-global-search": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-global-search.cy.js'",
+    "test-accessibility-cli-landing": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-landing.cy.js'",
+    "test-accessibility-cli-vocab": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-vocab.cy.js'",
+    "test-accessibility-cli-vocab-home": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-vocab-home.cy.js'",
+    "test-accessibility-cli-vocab-search": "npx cypress run --env cli=true --spec 'tests/cypress/accessibility/axe-vocab-search.cy.js'"
   },
   "dependencies": {
     "bootstrap": "^5.2.3",

tests/cypress/accessibility-tests/axe-about.cy.js → tests/cypress/accessibility/axe-about.cy.js

@@ -4,7 +4,7 @@ import 'cypress-axe';
 /* If you want the test to be skipped, add a skip command after the describe part:
     - test enabled: describe('Check accessibility of ...
     - test to be skipped: describe.skip('Check accessibility of ... */
-describe('Check accessibility of the about page', () => {
+describe.skip('Check accessibility of the about page', () => {
   before(() => {
     cy.visit('/fi/about')
     cy.injectAxe()

tests/cypress/accessibility-tests/axe-feedback.cy.js → tests/cypress/accessibility/axe-feedback.cy.js

@@ -4,7 +4,7 @@ import 'cypress-axe';
 /* If you want the test to be skipped, add a skip command after the describe part:
     - test enabled: describe('Check accessibility of ...
     - test to be skipped: describe.skip('Check accessibility of ... */
-describe('Check accessibility of the feedback page', () => {
+describe.skip('Check accessibility of the feedback page', () => {
   before(() => {
     cy.visit('/fi/feedback')
     cy.injectAxe()

tests/cypress/accessibility-tests/axe-landing.cy.js → tests/cypress/accessibility/axe-landing.cy.js

@@ -3,7 +3,7 @@ import 'cypress-axe';
 /* If you want the test to be skipped, add a skip command after the describe part:
     - test enabled: describe('Check accessibility of ...
     - test to be skipped: describe.skip('Check accessibility of ... */
-describe('Check accessibility of the landing page', () => {
+describe.skip('Check accessibility of the landing page', () => {
   before(() => {
     cy.visit('/')
     cy.injectAxe()

tests/cypress/accessibility-tests/axe-vocab-home.cy.js → tests/cypress/accessibility/axe-vocab-home.cy.js

@@ -4,7 +4,7 @@ import 'cypress-axe';
 /* If you want the test to be skipped, add a skip command after the describe part:
     - test enabled: describe('Check accessibility of ...
     - test to be skipped: describe.skip('Check accessibility of ... */
-describe('Check accessibility of the vocab-home page', () => {
+describe.skip('Check accessibility of the vocab-home page', () => {
   before(() => {
     cy.visit('/agrovoc/fi/')
     cy.injectAxe()

tests/cypress/accessibility-tests/axe-vocab.cy.js → tests/cypress/accessibility/axe-vocab.cy.js

@@ -4,7 +4,7 @@ import 'cypress-axe';
 /* If you want the test to be skipped, add a skip command after the describe part:
     - test enabled: describe('Check accessibility of ...
     - test to be skipped: describe.skip('Check accessibility of ... */
-describe('Check accessibility of the vocab page', () => {
+describe.skip('Check accessibility of the vocab page', () => {
   before(() => {
     cy.visit('/juho/fi')
     cy.injectAxe()

tests/cypress/e2e/README.md

@@ -0,0 +1 @@
+Folder for end-to-end tests.

tests/cypress/template-tests/vocab-home.cy.js → tests/cypress/template/vocab-home.cy.js

@@ -4,7 +4,6 @@ describe('Vocabulary home page', () => {
     cy.visit('/')
     // click on the first vocabulary in the list
     cy.get('#vocabulary-list').find('a').first().click()
-
     // check that the vocabulary title is not empty
     cy.get('#vocab-title > a').invoke('text').should('match', /.+/)
   })