Removing webmock from cucumber - interferes with capybara (more investigation needed).
This commit is contained in:
parent
e69da7c5e8
commit
50efd27710
2 changed files with 1 additions and 3 deletions
2
Gemfile
2
Gemfile
|
|
@ -60,7 +60,7 @@ group :test do
|
||||||
gem 'rspec-rails', '>= 2.0.0'
|
gem 'rspec-rails', '>= 2.0.0'
|
||||||
gem 'mocha'
|
gem 'mocha'
|
||||||
gem 'database_cleaner', '0.5.2'
|
gem 'database_cleaner', '0.5.2'
|
||||||
gem 'webmock'
|
gem 'webmock', :require => false
|
||||||
gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
|
gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
|
||||||
gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
|
gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,6 @@ require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links wi
|
||||||
# steps to use the XPath syntax.
|
# steps to use the XPath syntax.
|
||||||
Capybara.default_selector = :css
|
Capybara.default_selector = :css
|
||||||
|
|
||||||
WebMock.disable_net_connect!(:allow_localhost => true)
|
|
||||||
|
|
||||||
# If you set this to false, any error raised from within your app will bubble
|
# If you set this to false, any error raised from within your app will bubble
|
||||||
# up to your step definition and out to cucumber unless you catch it somewhere
|
# up to your step definition and out to cucumber unless you catch it somewhere
|
||||||
# on the way. You can make Rails rescue errors and render error pages on a
|
# on the way. You can make Rails rescue errors and render error pages on a
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue