spec/spec_helper.rb in authenticate-0.3.1 vs spec/spec_helper.rb in authenticate-0.3.2

- old
+ new

@@ -1,9 +1,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) ENV['RAILS_ENV'] ||= 'test' -require File.expand_path('../dummy/config/environment.rb', __FILE__) +require File.expand_path('../dummy/config/environment.rb', __FILE__) require 'rspec/rails' require 'shoulda-matchers' require 'capybara/rails' require 'capybara/rspec' require 'database_cleaner' @@ -24,34 +24,26 @@ config.include FactoryGirl::Syntax::Methods config.infer_spec_type_from_file_location! config.order = :random config.use_transactional_fixtures = true - # config.mock_with :rspec - config.expect_with :rspec do |expectations| expectations.syntax = :expect end config.mock_with :rspec do |mocks| mocks.syntax = :expect end - - config.after(:each, :type => :feature) do + config.after(:each, type: :feature) do DatabaseCleaner.clean # Truncate the database Capybara.reset_sessions! # Forget the (simulated) browser state Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver end end - -def restore_default_configuration - puts 'restore_default_configuration called!!!!!!!!!!!!!!!!!!!!!' -end - def mock_request(params = {}) - req = double("request") + req = double('request') allow(req).to receive(:params).and_return(params) allow(req).to receive(:remote_ip).and_return('111.111.111.111') req end