Skip to content

fix: viewport from CLI on CT #20849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2022
Merged

fix: viewport from CLI on CT #20849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f209be1
fix: viewport from CLI on CT
estrada9166 Mar 30, 2022
9508dfb
Add tests
estrada9166 Mar 30, 2022
17a70cb
Merge branch '10.0-release' into alejandro/fix/ct-cli-viewport
estrada9166 Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/app/cypress/e2e/cypress-in-cypress-component.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,15 @@ describe('Cypress In Cypress CT', { viewportWidth: 1500, defaultCommandTimeout:
)
})
})

it('set the correct viewport values from CLI', () => {
cy.openProject('cypress-in-cypress', ['--config', 'viewportWidth=333,viewportHeight=333'])
cy.startAppServer('component')

cy.visitApp()
cy.contains('TestComponent.spec').click()

cy.get('#unified-runner').should('have.css', 'width', '333px')
cy.get('#unified-runner').should('have.css', 'height', '333px')
})
})
13 changes: 13 additions & 0 deletions packages/app/cypress/e2e/cypress-in-cypress-e2e.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,17 @@ describe('Cypress In Cypress E2E', { viewportWidth: 1500, defaultCommandTimeout:
cy.get('[data-model-state="failed"]').should('contain', 'renders the blank page')
cy.percySnapshot()
})

it('set the correct viewport values from CLI', () => {
cy.openProject('cypress-in-cypress', ['--config', 'viewportWidth=333,viewportHeight=333'])
cy.startAppServer()

cy.visitApp()
cy.contains('dom-content.spec').click()

cy.get('.toggle-specs-wrapper').click()

cy.get('#unified-runner').should('have.css', 'width', '333px')
cy.get('#unified-runner').should('have.css', 'height', '333px')
})
})
4 changes: 2 additions & 2 deletions packages/config/src/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,12 @@ const resolvedOptions: Array<ResolvedConfigOption> = [
canUpdateDuringTestTime: false,
}, {
name: 'viewportHeight',
defaultValue: 660,
defaultValue: (options: Record<string, any> = {}) => options.testingType === 'component' ? 500 : 660,
validation: validate.isNumber,
canUpdateDuringTestTime: true,
}, {
name: 'viewportWidth',
defaultValue: 1000,
defaultValue: (options: Record<string, any> = {}) => options.testingType === 'component' ? 500 : 1000,
Copy link
Contributor

@lmiller1990 lmiller1990 Mar 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be options: Cypress.Config?

Copy link
Member Author

@estrada9166 estrada9166 Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it should be Cypress.Config because it comes from here which is when we are building the config in runtime

Copy link
Contributor

@lmiller1990 lmiller1990 Apr 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, seems fine then. 👍

validation: validate.isNumber,
canUpdateDuringTestTime: true,
}, {
Expand Down
9 changes: 0 additions & 9 deletions packages/server/lib/project-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,9 @@ export class ProjectBase<TServer extends Server> extends EE {
injectCtSpecificConfig (cfg) {
cfg.resolved.testingType = { value: 'component' }

// This value is normally set up in the `packages/server/lib/plugins/index.js#110`
// But if we don't return it in the plugins function, it never gets set
// Since there is no chance that it will have any other value here, we set it to "component"
// This allows users to not return config in the `cypress/plugins/index.js` file
// https://github.com/cypress-io/cypress/issues/16860
const rawJson = cfg.rawJson as Cfg

return {
...cfg,
componentTesting: true,
viewportHeight: rawJson.viewportHeight ?? 500,
viewportWidth: rawJson.viewportWidth ?? 500,
}
}

Expand Down