Skip to content

Commit

Permalink
Increase max viewport width to 4000px (cypress-io#5189)
Browse files Browse the repository at this point in the history
* increasing max viewport width to 4000px

* Update window_spec.coffee
  • Loading branch information
nico-bellante authored and grabartley committed Oct 6, 2019
1 parent d837b0d commit 6961ce3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion packages/driver/src/cy/commands/window.coffee
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 <= 3000
val >= 20 and val <= 4000

switch
when _.isString(presetOrWidth) and _.isBlank(presetOrWidth)
Expand Down
2 changes: 1 addition & 1 deletion packages/driver/src/cypress/error_messages.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,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 3000px."
dimensions_out_of_range: "#{cmd('viewport')} width and height must be between 20px and 4000px."
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
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 3000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
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 3000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
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 3000", (done) ->
it "throws when passed height greater than than 4000", (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 3000px."
expect(err.message).to.eq "cy.viewport() width and height must be between 20px and 4000px."
done()

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

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

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

0 comments on commit 6961ce3

Please sign in to comment.