spec/spec_helper.rb in chanko-2.0.6 vs spec/spec_helper.rb in chanko-2.0.7

@@ -10,21 +10,34 @@
 ENV["RAILS_ENV"] ||= "test"
 require "chanko"
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
-require "rspec/autorun"
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
   config.after do
     Chanko::Config.reset
     Chanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)
   end
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end
 
 Chanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)