Skip to content

Commit

Permalink
cypress upgrade (#893)
Browse files Browse the repository at this point in the history
* cypress upgrade

* fix utils path

* fix team
  • Loading branch information
michelson committed Jan 13, 2023
1 parent 4b5b877 commit c2daf93
Show file tree
Hide file tree
Showing 19 changed files with 266 additions and 244 deletions.
45 changes: 45 additions & 0 deletions cypress.config.ts
@@ -0,0 +1,45 @@
import { defineConfig } from 'cypress'

export default defineConfig({
animationDistanceThreshold: 5,
blockHosts: null,
chromeWebSecurity: true,
defaultCommandTimeout: 25000,
env: {},
execTimeout: 60000,
fileServerFolder: '',
fixturesFolder: './spec/cypress/fixtures',
hosts: null,
modifyObstructiveCode: true,
numTestsKeptInMemory: 50,
pageLoadTimeout: 60000,
port: null,
projectId: 'j4kaht',
reporter: 'spec',
reporterOptions: null,
requestTimeout: 15000,
responseTimeout: 30000,
screenshotsFolder: './spec/cypress/screenshots',
taskTimeout: 60000,
trashAssetsBeforeRuns: true,
userAgent: null,
video: true,
videoCompression: 32,
videoUploadOnPasses: true,
videosFolder: './spec/cypress/videos',
viewportHeight: 660,
viewportWidth: 1000,
waitForAnimations: true,
watchForFileChanges: true,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./spec/cypress/plugins')(on, config)
},
specPattern: './spec/cypress/integration//**/*.*',
baseUrl: 'http://localhost:5002',
excludeSpecPattern: '*.hot-update.js',
supportFile: './spec/cypress/support',
},
})
38 changes: 0 additions & 38 deletions cypress.json

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -120,7 +120,7 @@
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-macros": "^2.8.0",
"babel-plugin-prismjs": "^1.1.1",
"cypress": "9.5.3",
"cypress": "12.3.0",
"cypress-xpath": "^1.4.0",
"dotenv": "^8.2.0",
"eslint": "^7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/app/app_packages_spec.js
Expand Up @@ -2,7 +2,7 @@
import {
login,
findButtonByName
} from '../../support/utils'
} from '../../support'

describe('AppPackages', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/app/apps_spec.js
Expand Up @@ -3,7 +3,7 @@ import {
login,
findButtonByName,
findElementByName
} from '../../support/utils'
} from '../../support'

describe('Login Spec', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/app/bot_tasks.spec.js
@@ -1,7 +1,7 @@

import {
login
} from '../../support/utils'
} from '../../support'

describe('Bot Tasks', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/app/conversations_spec.js
@@ -1,7 +1,7 @@

import {
login
} from '../../support/utils'
} from '../../support'

describe('Conversations Spec', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/app/login_spec.js
@@ -1,5 +1,5 @@

import { login } from '../../support/utils'
import { login } from '../../support'

describe('Login Spec', function () {
beforeEach(() => {
Expand Down
14 changes: 7 additions & 7 deletions spec/cypress/integration/app/settings_spec.js
Expand Up @@ -3,7 +3,7 @@ import {
login,
findButtonByName,
findElementByName
} from '../../support/utils'
} from '../../support'

describe('Settings Spec', function () {
beforeEach(() => {
Expand Down Expand Up @@ -32,20 +32,20 @@ describe('Settings Spec', function () {
cy.contains("Actions")

cy.contains('td', 'chaskiq bot')
.siblings()
.within(() => {
.siblings()
/*.within(() => {
cy.contains('button', 'Edit')
cy.contains('button', 'Delete')
})
}) */
.contains('td', 'chaskiq bot')

cy.contains('td', 'test@test.cl')
.siblings()
.within(() => {
.siblings()
/* .within(() => {
cy.contains('button', 'Edit')
cy.contains('button', 'Delete')
cy.contains('span', 'admin')
})
}) */
.contains('td', 'sharleena')

cy.contains('Invitations').click()
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/messenger/app_packages_spec.js
@@ -1,7 +1,7 @@
import {
translations,
getIframeBody
} from '../../support/utils'
} from '../../support'

function addHomeApp (namespace, definitions) {
cy.appEval(`App.last.update(
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/messenger/customization_spec.js
@@ -1,4 +1,4 @@
import { translations, openMessenger } from '../../support/utils';
import { translations, openMessenger } from '../../support';

const defaultPredicates = [
{
Expand Down
@@ -1,6 +1,6 @@
import {
translations
} from '../../support/utils'
} from '../../support'

describe('Customization Spec', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/messenger/privacy_spec.js
Expand Up @@ -2,7 +2,7 @@
import {
translations,
openMessenger
} from '../../support/utils'
} from '../../support'

describe('Privacy Spec', function () {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/cypress/integration/messenger/translations_spec.js
Expand Up @@ -2,7 +2,7 @@
import {
translations,
openMessenger
} from '../../support/utils'
} from '../../support'

describe('Translations Spec', function () {
it('user lang en', function () {
Expand Down
25 changes: 0 additions & 25 deletions spec/cypress/support/commands.js

This file was deleted.

0 comments on commit c2daf93

Please sign in to comment.