Commit 167e8e8

committed

Merge branch 'cypress-test-fix' into 'master'

fix(ui): prevent cypress test from failing See merge request postgres-ai/database-lab!807

2 parents 8119241 + 3013588 commit 167e8e8Copy full SHA for 167e8e8

File tree

-11

lines changed

-11

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ semgrep-sast:`
`57`	`57`	`reports:`
`58`	`58`	`sast: gl-sast-report.json`
`59`	`59`
`60`		`-test:`
	`60`	`+e2e-ce-ui-test:`
`61`	`61`	`<<: *ui_checks`
`62`	`62`	`<<: *ui_cache`
`63`	`63`	`image: node:latest`
`64`		`- stage: test`
	`64`	`+ stage: integration-test`
`65`	`65`	`before_script:`
`66`	`66`	`- apt update && apt install curl`
`67`	`67`	`- apt install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`import { defineConfig } from 'cypress'`
`2`	`2`
`3`	`3`	`export default defineConfig({`
`4`		`- pageLoadTimeout: 10000,`
`5`		`- defaultCommandTimeout: 10000,`
`6`	`4`	`e2e: {`
`7`	`5`	`testIsolation: false,`
`8`	`6`	`supportFile: false,`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,15 @@`
`1`	`1`	`/* eslint-disable no-undef */`
`2`	`2`
`3`	`3`	`describe('Instance page should have "Configuration" tab with content', () => {`
`4`		`- beforeEach(() => {`
`5`		`- cy.visit('/')`
`6`		`- })`
`7`		`-`
`8`	`4`	`it('should have token in local storage', () => {`
`9`	`5`	`cy.window().then((win) => {`
`10`	`6`	`if (!win.localStorage.getItem('token')) {`
`11`		`- window.localStorage.setItem('token', 'demo-token')`
	`7`	`+ win.localStorage.setItem('token', 'demo-token')`
`12`	`8`	`}`
`13`	`9`	`})`
`14`	`10`	`})`
`15`		`-`
`16`	`11`	`it('should have "Configuration" tab with content', () => {`
`17`		`- cy.once('uncaught:exception',()=>false)`
	`12`	`+ cy.visit('/')`
`18`	`13`	`cy.get('.MuiTabs-flexContainer').contains('Configuration')`
`19`	`14`	`cy.get('.MuiBox-root').contains('p').should('have.length.greaterThan', 0)`
`20`	`15`	`})`

Comments

(0)