Update capybara
This commit is contained in:
parent
a43f3b9e3d
commit
917d02a4e5
1
Gemfile
1
Gemfile
@ -60,7 +60,6 @@ end
|
|||||||
group :test, :staging do
|
group :test, :staging do
|
||||||
gem 'capybara'
|
gem 'capybara'
|
||||||
gem 'database_cleaner'
|
gem 'database_cleaner'
|
||||||
gem "poltergeist"
|
|
||||||
gem 'launchy'
|
gem 'launchy'
|
||||||
gem 'selenium-webdriver'
|
gem 'selenium-webdriver'
|
||||||
gem 'simplecov', :require => false
|
gem 'simplecov', :require => false
|
||||||
|
|||||||
@ -103,7 +103,6 @@ GEM
|
|||||||
chartkick (3.0.2)
|
chartkick (3.0.2)
|
||||||
childprocess (0.9.0)
|
childprocess (0.9.0)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
cliver (0.3.2)
|
|
||||||
coderay (1.1.2)
|
coderay (1.1.2)
|
||||||
coffee-rails (4.2.2)
|
coffee-rails (4.2.2)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
@ -257,10 +256,6 @@ GEM
|
|||||||
parser (2.6.0.0)
|
parser (2.6.0.0)
|
||||||
ast (~> 2.4.0)
|
ast (~> 2.4.0)
|
||||||
pg (1.1.4)
|
pg (1.1.4)
|
||||||
poltergeist (1.18.1)
|
|
||||||
capybara (>= 2.1, < 4)
|
|
||||||
cliver (~> 0.3.1)
|
|
||||||
websocket-driver (>= 0.2.0)
|
|
||||||
powerpack (0.1.2)
|
powerpack (0.1.2)
|
||||||
pry (0.12.2)
|
pry (0.12.2)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
@ -470,7 +465,6 @@ DEPENDENCIES
|
|||||||
launchy
|
launchy
|
||||||
parallel_tests
|
parallel_tests
|
||||||
pg
|
pg
|
||||||
poltergeist
|
|
||||||
pry-rails
|
pry-rails
|
||||||
pry-rescue
|
pry-rescue
|
||||||
puma
|
puma
|
||||||
|
|||||||
@ -1,16 +1,15 @@
|
|||||||
require 'capybara/poltergeist'
|
Capybara.server = :puma # Until your setup is working
|
||||||
|
# Capybara.server = :puma, { Silent: true } # To clean up your test output
|
||||||
|
#asset_hosts = {
|
||||||
|
# staging: 'http://13staging.owlephant.icu',
|
||||||
|
# development: 'http://localhost:3000',
|
||||||
|
# test: 'http://localhost:3000'
|
||||||
|
#}
|
||||||
|
|
||||||
asset_hosts = {
|
#if ENV['RAILS_ENV'] == 'staging'
|
||||||
staging: 'http://staging.tienlen.ga',
|
# #Capybara.run_server = false
|
||||||
development: 'http://localhost:3000',
|
# Capybara.app_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
|
||||||
test: 'http://localhost:3000'
|
#end
|
||||||
}
|
#Capybara.asset_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
|
||||||
|
|
||||||
if ENV['RAILS_ENV'] == 'staging'
|
Capybara.javascript_driver = :selenium_chrome_headless
|
||||||
#Capybara.run_server = false
|
|
||||||
Capybara.app_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
|
|
||||||
end
|
|
||||||
Capybara.asset_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
|
|
||||||
|
|
||||||
Capybara.javascript_driver = :poltergeist
|
|
||||||
#Capybara.javascript_driver = :selenium
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user