summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 11:27:22 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 11:27:22 +0200
commit42ce2c108022f09e6c8e2fa9a90ea3f74f2b97b4 (patch)
tree3b7718b672d7233147c5df251ee380d925e8c40f /spec/spec_helper.rb
parent03f6a28ec0dab308070e83ec422f12fa289aad9f (diff)
downloadgitlab-ce-42ce2c108022f09e6c8e2fa9a90ea3f74f2b97b4.tar.gz
improve selectors to pass capybara 2.0
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c138d9a6334..f6f70cfd96a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,14 +10,13 @@ require 'capybara/rspec'
require 'webmock/rspec'
require 'email_spec'
require 'sidekiq/testing/inline'
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
WebMock.disable_net_connect!(allow_localhost: true)
RSpec.configure do |config|