Skip to content
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

Jump to bottom

Increase max parameters for cy.viewport() #5882

Merged
merged 6 commits into from
Dec 5, 2019
Merged

Increase max parameters for cy.viewport() #5882

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b634486
Merge branch 'develop'
brian-mann Oct 23, 2019
a0ef433
Merge remote-tracking branch 'origin/develop'
flotwig Oct 31, 2019
e629913
Merge branch 'develop'
flotwig Nov 8, 2019
26c8e7f
Merge branch 'develop'
flotwig Nov 27, 2019
73e13cf
Increase Max height / width to 8000px
digiink Dec 4, 2019
a8b7346
Merge branch 'develop' into master
digiink Dec 5, 2019
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
2 changes: 1 addition & 1 deletion packages/driver/src/cy/commands/window.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->

widthAndHeightAreWithinBounds = (width, height) ->
_.every [width, height], (val) ->
val >= 20 and val <= 4000
val >= 20 and val <= 8000

switch
when _.isString(presetOrWidth) and _.isBlank(presetOrWidth)
Expand Down
2 changes: 1 addition & 1 deletion packages/driver/src/cypress/error_messages.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ module.exports = {

viewport:
bad_args: "#{cmd('viewport')} can only accept a string preset or a width and height as numbers."
dimensions_out_of_range: "#{cmd('viewport')} width and height must be between 20px and 4000px."
dimensions_out_of_range: "#{cmd('viewport')} width and height must be between 20px and 8000px."
empty_string: "#{cmd('viewport')} cannot be passed an empty string."
invalid_orientation: "#{cmd('viewport')} can only accept '{{all}}' as valid orientations. Your orientation was: '{{orientation}}'"
missing_preset: "#{cmd('viewport')} could not find a preset for: '{{preset}}'. Available presets are: {{presets}}"
Expand Down
14 changes: 7 additions & 7 deletions packages/driver/test/cypress/integration/commands/window_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,32 +640,32 @@ describe "src/cy/commands/window", ->
it "throws when passed negative numbers", (done) ->
cy.on "fail", (err) =>
expect(@logs.length).to.eq(1)
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 8000px."
done()

cy.viewport(800, -600)

it "throws when passed width less than 20", (done) ->
cy.on "fail", (err) =>
expect(@logs.length).to.eq(1)
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 8000px."
done()

cy.viewport(19, 600)

it "does not throw when passed width equal to 20", ->
cy.viewport(20, 600)

it "throws when passed height greater than than 4000", (done) ->
it "throws when passed height greater than than 8000", (done) ->
cy.on "fail", (err) =>
expect(@logs.length).to.eq(1)
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 8000px."
done()

cy.viewport(1000, 4001)
cy.viewport(1000, 8001)

it "does not throw when passed width equal to 4000", ->
cy.viewport(200, 4000)
it "does not throw when passed width equal to 8000", ->
cy.viewport(200, 8000)

it "throws when passed an empty string as width", (done) ->
cy.on "fail", (err) =>
Expand Down