diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 14:33:04 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 21:33:16 -0400 |
| commit | 86edfce4422038fae9c94b8ed39579079fb3adba (patch) | |
| tree | 7850aeb566abc13d68f77bbbc93f7f33efdbaba6 /spec/spec_helper.rb | |
| parent | 1e3fc84cd1d0aa004fb69d18ca392af8877cc07a (diff) | |
| download | gitlab-ce-86edfce4422038fae9c94b8ed39579079fb3adba.tar.gz | |
Move RSpec setup for Capybara to its own support file
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 53ccaa4fd67..8fe51cf4add 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,19 +10,13 @@ end ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' -require 'capybara/rails' -require 'capybara/rspec' require 'webmock/rspec' require 'email_spec' require 'sidekiq/testing/inline' -require 'capybara/poltergeist' - -Capybara.javascript_driver = :poltergeist -Capybara.default_wait_time = 10 # 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} +Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } WebMock.disable_net_connect!(allow_localhost: true) |