nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7502 from SuperTux88/cucumber-first-login-timeout

Browse source 
Cache assets-cache for cucumber on travis
This commit is contained in:
Benjamin Neff 2017-07-23 19:43:03 +02:00
commit 35e9faf5f2
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -15,6 +15,7 @@ cache:
bundler: true bundler: true
directories: directories:
- app/assets/images - app/assets/images
- tmp/cache/assets/test
branches: branches:
only: only:

2
features/support/env.rb
View file

@ -23,7 +23,7 @@ Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
Capybara.register_driver :poltergeist do |app| Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, timeout: 80) Capybara::Poltergeist::Driver.new(app, timeout: 30)
end end
Capybara.javascript_driver = :poltergeist Capybara.javascript_driver = :poltergeist