summaryrefslogtreecommitdiff
path: root/spec/support/capybara.rb
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-02-26 09:32:07 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-02-26 09:32:07 -0500
commit08ec838ed501473846806be2680e8888ff859e10 (patch)
tree4a4664c505d667db907084bd8850cd689f338f7e /spec/support/capybara.rb
parentb2dcfc4db3828888f9aa0a9cc38e89fe84d30b2c (diff)
parentf150b8a5b9a6f56151523061813bad2cf48c9d91 (diff)
downloadgitlab-ce-08ec838ed501473846806be2680e8888ff859e10.tar.gz
Merge branch 'master' into avatar-croppingavatar-cropping
Diffstat (limited to 'spec/support/capybara.rb')
-rw-r--r--spec/support/capybara.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index a698f484df1..65d59e6813c 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -7,7 +7,7 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 10
Capybara.javascript_driver = :poltergeist
Capybara.register_driver :poltergeist do |app|
- Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout)
+ Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
end
Capybara.default_wait_time = timeout