1 files changed, 11 insertions, 35 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 54d3068..1d56dee 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,52 +9,28 @@ if ENV['COVERALLS']
 end
 
 ENV["RAILS_ENV"] ||= 'test'
+
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
+require 'shoulda/matchers'
 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}
 
-require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true)
-
 RSpec.configure do |config|
-  config.include LoginHelpers, type: :feature
+  config.use_transactional_fixtures = false
+  config.use_instantiated_fixtures  = false
+  config.mock_with :rspec
 
+  config.include LoginHelpers, type: :feature
+  config.include LoginHelpers, type: :request
   config.include StubGitlabCalls
   config.include StubGitlabData
 
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = false
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
+  config.infer_spec_type_from_file_location!
+  config.raise_errors_for_deprecations!
 end
+
+ActiveRecord::Migration.maintain_test_schema!