Fixes for Rails 4

sdball · Oct 10, 2014 · 22ba77a · 22ba77a
1 parent da939c2
commit 22ba77a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -30,7 +30,7 @@
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.mass_assignment_sanitizer = :strict if Rails::VERSION::MAJOR < 4
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

diff --git a/test/spec_helper.rb b/test/spec_helper.rb
@@ -4,6 +4,7 @@
 require 'rails/test_help'
 require 'minitest/autorun'
 require "capybara/rails"
+require 'turn'
 
 Rails.backtrace_cleaner.remove_silencers!