From 4f1f8bb4eaaaed2ef0768bfb796133f19f722b32 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 4 Nov 2022 10:04:29 +0100 Subject: [PATCH] Bug 32030: Move cypress to t/ Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- cypress.json | 11 +++++++++-- {cypress => t/cypress}/fixtures/file.json | 0 {cypress => t/cypress}/integration/Agreements_spec.ts | 2 +- {cypress => t/cypress}/integration/Licenses_spec.ts | 2 +- {cypress => t/cypress}/integration/Packages_spec.ts | 0 {cypress => t/cypress}/integration/Titles_spec.ts | 0 {cypress => t/cypress}/plugins/index.js | 0 {cypress => t/cypress}/support/commands.js | 0 {cypress => t/cypress}/support/index.js | 0 webpack.config.js | 4 ++-- 10 files changed, 13 insertions(+), 6 deletions(-) rename {cypress => t/cypress}/fixtures/file.json (100%) rename {cypress => t/cypress}/integration/Agreements_spec.ts (99%) rename {cypress => t/cypress}/integration/Licenses_spec.ts (99%) rename {cypress => t/cypress}/integration/Packages_spec.ts (100%) rename {cypress => t/cypress}/integration/Titles_spec.ts (100%) rename {cypress => t/cypress}/plugins/index.js (100%) rename {cypress => t/cypress}/support/commands.js (100%) rename {cypress => t/cypress}/support/index.js (100%) diff --git a/cypress.json b/cypress.json index 41f5e30897..248b6ab60d 100644 --- a/cypress.json +++ b/cypress.json @@ -1,3 +1,10 @@ { - "baseUrl": "http://kohadev-intra.mydnsname.org:8081" -} \ No newline at end of file + "baseUrl": "http://kohadev-intra.mydnsname.org:8081", + "fixturesFolder": "t/cypress/fixtures", + "integrationFolder": "t/cypress/integration", + "pluginsFile": "t/cypress/plugins", + "screenshotsFolder": "t/cypress/screenshots", + "supportFile": "t/cypress/support", + "videosFolder": "t/cypress/videos", + "testFiles": "**/*.*" +} diff --git a/cypress/fixtures/file.json b/t/cypress/fixtures/file.json similarity index 100% rename from cypress/fixtures/file.json rename to t/cypress/fixtures/file.json diff --git a/cypress/integration/Agreements_spec.ts b/t/cypress/integration/Agreements_spec.ts similarity index 99% rename from cypress/integration/Agreements_spec.ts rename to t/cypress/integration/Agreements_spec.ts index 7e394faa01..5dd3b03846 100644 --- a/cypress/integration/Agreements_spec.ts +++ b/t/cypress/integration/Agreements_spec.ts @@ -263,7 +263,7 @@ describe("Agreement CRUD operations", () => { // Add new document cy.get("#documents").contains("Add new document").click(); cy.get("#document_0 input[id=file_0]").click(); - cy.get('#document_0 input[id=file_0]').selectFile('cypress/fixtures/file.json'); + cy.get('#document_0 input[id=file_0]').selectFile('t/cypress/fixtures/file.json'); cy.get("#document_0 .file_information span").contains("file.json"); cy.get('#document_0 input[id=file_description_0]').type('file description'); cy.get('#document_0 input[id=physical_location_0]').type('file physical location'); diff --git a/cypress/integration/Licenses_spec.ts b/t/cypress/integration/Licenses_spec.ts similarity index 99% rename from cypress/integration/Licenses_spec.ts rename to t/cypress/integration/Licenses_spec.ts index 1dd56f4526..ef314bb0db 100644 --- a/cypress/integration/Licenses_spec.ts +++ b/t/cypress/integration/Licenses_spec.ts @@ -108,7 +108,7 @@ describe("License CRUD operations", () => { // Add new document cy.get("#documents").contains("Add new document").click(); cy.get("#document_0 input[id=file_0]").click(); - cy.get('#document_0 input[id=file_0]').selectFile('cypress/fixtures/file.json'); + cy.get('#document_0 input[id=file_0]').selectFile('t/cypress/fixtures/file.json'); cy.get("#document_0 .file_information span").contains("file.json"); cy.get('#document_0 input[id=file_description_0]').type('file description'); cy.get('#document_0 input[id=physical_location_0]').type('file physical location'); diff --git a/cypress/integration/Packages_spec.ts b/t/cypress/integration/Packages_spec.ts similarity index 100% rename from cypress/integration/Packages_spec.ts rename to t/cypress/integration/Packages_spec.ts diff --git a/cypress/integration/Titles_spec.ts b/t/cypress/integration/Titles_spec.ts similarity index 100% rename from cypress/integration/Titles_spec.ts rename to t/cypress/integration/Titles_spec.ts diff --git a/cypress/plugins/index.js b/t/cypress/plugins/index.js similarity index 100% rename from cypress/plugins/index.js rename to t/cypress/plugins/index.js diff --git a/cypress/support/commands.js b/t/cypress/support/commands.js similarity index 100% rename from cypress/support/commands.js rename to t/cypress/support/commands.js diff --git a/cypress/support/index.js b/t/cypress/support/index.js similarity index 100% rename from cypress/support/index.js rename to t/cypress/support/index.js diff --git a/webpack.config.js b/webpack.config.js index e009cba3f7..ebc67b7d37 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,7 +17,7 @@ module.exports = { { test: /\.vue$/, loader: "vue-loader", - exclude: [path.resolve(__dirname, "cypress/")], + exclude: [path.resolve(__dirname, "t/cypress/")], }, { test: /\.ts$/, @@ -25,7 +25,7 @@ module.exports = { options: { appendTsSuffixTo: [/\.vue$/] }, - exclude: [path.resolve(__dirname, "cypress/")], + exclude: [path.resolve(__dirname, "t/cypress/")], }, { test: /\.css$/, -- 2.39.2