htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use WebKit with Capybara

Browse Source
This commit is contained in:
Hauke Klement
2015-01-29 15:03:19 +01:00
parent 3a382491ae
commit 62adb1a8e2
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -43,7 +43,6 @@ end
group :test do group :test do
gem 'autotest-rails' gem 'autotest-rails'
gem 'capybara' gem 'capybara'
gem 'capybara-webkit'
gem 'codeclimate-test-reporter', require: nil gem 'codeclimate-test-reporter', require: nil
gem 'database_cleaner' gem 'database_cleaner'
gem 'nyan-cat-formatter' gem 'nyan-cat-formatter'

4
Gemfile.lock
View File

@ -66,9 +66,6 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-webkit (1.4.1)
capybara (>= 2.3.0, < 2.5.0)
json
carrierwave (0.10.0) carrierwave (0.10.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
@ -306,7 +303,6 @@ DEPENDENCIES
capistrano-upload-config capistrano-upload-config
capistrano3-puma capistrano3-puma
capybara capybara
capybara-webkit
carrierwave carrierwave
codeclimate-test-reporter codeclimate-test-reporter
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)

2
spec/rails_helper.rb
View File

@ -20,8 +20,6 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
# If you are not using ActiveRecord, you can remove this line. # If you are not using ActiveRecord, you can remove this line.
ActiveRecord::Migration.maintain_test_schema! ActiveRecord::Migration.maintain_test_schema!
Capybara.javascript_driver = :webkit
RSpec.configure do |config| RSpec.configure do |config|
config.around(:each) do |example| config.around(:each) do |example|
Timeout::timeout(example.metadata[:permitted_execution_time] || MAXIMUM_EXECUTION_TIME) { example.run } Timeout::timeout(example.metadata[:permitted_execution_time] || MAXIMUM_EXECUTION_TIME) { example.run }