Merged in feature/upgrade_cypress (pull request #76)
Upgrade to Cypress 12 * Upgrade cypress * Several fixes * Fix cypress tests Approved-by: Daniel Egger
This commit is contained in:
parent
aab9373c3e
commit
09d56091f1
|
|
@ -13,7 +13,7 @@ e2e: &e2e
|
|||
- vbvpip
|
||||
- cypress
|
||||
script:
|
||||
- export CURRENTS_KEY=etzp5VXtJcSX8Z4H
|
||||
- export CURRENTS_RECORD_KEY=etzp5VXtJcSX8Z4H
|
||||
- export IT_SERVE_VUE=false
|
||||
- export IT_ALLOW_LOCAL_LOGIN=true
|
||||
- source ./env/bitbucket/prepare_for_test.sh
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
module.exports = {
|
||||
projectId: "RVEZS1",
|
||||
recordKey: "etzp5VXtJcSX8Z4H",
|
||||
};
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
const { defineConfig } = require('cypress')
|
||||
const { defineConfig } = require("cypress");
|
||||
const { cloudPlugin } = require("cypress-cloud/plugin");
|
||||
|
||||
module.exports = defineConfig({
|
||||
projectId: 'RVEZS1',
|
||||
projectId: "RVEZS1",
|
||||
watchForFileChanges: false,
|
||||
video: false,
|
||||
viewportWidth: 1280,
|
||||
|
|
@ -10,18 +11,16 @@ module.exports = defineConfig({
|
|||
runMode: 1,
|
||||
openMode: 0,
|
||||
},
|
||||
reporter: 'junit',
|
||||
reporter: "junit",
|
||||
reporterOptions: {
|
||||
mochaFile: 'cypress/test-reports/cypress-results-[hash].xml',
|
||||
mochaFile: "cypress/test-reports/cypress-results-[hash].xml",
|
||||
toConsole: true,
|
||||
},
|
||||
e2e: {
|
||||
// experimentalSessionAndOrigin: true,
|
||||
// We've imported your old cypress plugins here.
|
||||
// You may want to clean this up later by importing these.
|
||||
setupNodeEvents(on, config) {
|
||||
return require('./cypress/plugins/index.js')(on, config)
|
||||
return cloudPlugin(on, config);
|
||||
},
|
||||
baseUrl: 'http://localhost:8001',
|
||||
baseUrl: "http://localhost:8001",
|
||||
},
|
||||
})
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,9 +13,11 @@ describe("notifications page", () => {
|
|||
cy.get('[data-cy="no-notifications"]').should("not.exist");
|
||||
cy.get("[data-cy^=notification-idx-]").should("have.length", 7);
|
||||
// All notifications shall be marker as unread
|
||||
cy.get("[data-cy^=notification-idx-]").within(() => {
|
||||
cy.get('[data-cy="unread"]').should("exist");
|
||||
});
|
||||
cy.get("[data-cy^=notification-idx-]")
|
||||
.first()
|
||||
.within(() => {
|
||||
cy.get('[data-cy="unread"]').should("exist");
|
||||
});
|
||||
|
||||
// We load additional 7 notifications
|
||||
cy.get('[data-cy="load-more-notifications"]').click();
|
||||
|
|
@ -28,9 +30,11 @@ describe("notifications page", () => {
|
|||
});
|
||||
}
|
||||
for (let i = 7; i < 13; i++) {
|
||||
cy.get(`[data-cy=notification-idx-${i}]`).within(() => {
|
||||
cy.get('[data-cy="unread"]').should("exist");
|
||||
});
|
||||
cy.get(`[data-cy=notification-idx-${i}]`)
|
||||
.first()
|
||||
.within(() => {
|
||||
cy.get('[data-cy="unread"]').should("exist");
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,13 +5,13 @@
|
|||
"build": "npm install --prefix client && npm run build --prefix client && npm run build:tailwind --prefix client",
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"cypress:open": "cypress open",
|
||||
"cypress:ci": "currents run --parallel --record --key $CURRENTS_KEY",
|
||||
"cypress:ci": "cypress-cloud run --parallel --record",
|
||||
"prettier": "npm run prettier --prefix client",
|
||||
"vue-i18n-extract": "npm run vue-i18n-extract --prefix client"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@currents/cli": "^3.1.3",
|
||||
"cypress": "^10.6.0"
|
||||
"cypress": "^12.12.0",
|
||||
"cypress-cloud": "^1.7.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"pa11y": "^6.2.3"
|
||||
|
|
|
|||
Loading…
Reference in New Issue