Skip to content

Commit 1002b5a

Browse files
authored
Merge branch 'develop' into bugfix/screenshot-blackouts
2 parents 12724e2 + 782dfb7 commit 1002b5a

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

packages/frontend-shared/src/locales/en-US.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@
357357
"content": {
358358
"e2eTitle": "End-to-end Tests",
359359
"e2eBullet1": "Visit URLs via",
360-
"e2eBullet2": "Test flows and functionality across multiple pages.",
361-
"e2eBullet3": "Ideal for testing integrated flows in CD workflows.",
360+
"e2eBullet2": "Test flows and functionality across multiple pages",
361+
"e2eBullet3": "Ideal for testing integrated flows in CD workflows",
362362
"componentTitle": "Component Tests",
363363
"ctBullet1": "Import components via",
364364
"ctBullet2": "Test individual components of a design system in isolation",

packages/launchpad/src/setup/CompareTestingTypes.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ it('closes when the X button is pressed', () => {
3939
`
4040
4141
const e2eCode = `
42-
it('only shows a promotional modal on first visit', () => {
42+
it('only shows a modal on first visit', () => {
4343
cy.visit('http://localhost:3000/')
4444
.get('[data-testid=modal]')
4545
.should('be.visible')
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import systemTests from '../lib/system-tests'
22

3-
// see: https://github.com/cypress-io/cypress/issues/22589
4-
systemTests.it('should not run CT side effects in e2e with mount registration', {
5-
project: 'component-tests',
6-
spec: 'passing-with-mount.cy.js',
7-
browser: 'chrome',
8-
configFile: 'cypress-e2e-mount-import.config.js',
9-
expectedExitCode: 0,
3+
describe('e2e tests with mount import', () => {
4+
systemTests.setup()
5+
6+
// see: https://github.com/cypress-io/cypress/issues/22589
7+
systemTests.it('should not run CT side effects in e2e with mount registration', {
8+
project: 'component-tests',
9+
spec: 'passing-with-mount.cy.js',
10+
browser: 'chrome',
11+
configFile: 'cypress-e2e-mount-import.config.js',
12+
expectedExitCode: 0,
13+
})
1014
})

0 commit comments

Comments
 (0)