aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt5
-rw-r--r--railties/test/application/rake_test.rb21
2 files changed, 15 insertions, 11 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..ee068b0202 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -34,11 +34,6 @@
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
- <%- unless options.skip_active_record? -%>
- # Raise exception on mass assignment protection for ActiveRecord models
- config.active_record.mass_assignment_sanitizer = :strict
- <%- end -%>
-
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index b61e2851bf..7671c129e9 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -61,22 +61,22 @@ module ApplicationTests
def test_rake_test_error_output
Dir.chdir(app_path){ `rake db:migrate` }
-
+
app_file "config/database.yml", <<-RUBY
development:
RUBY
-
+
app_file "test/unit/one_unit_test.rb", <<-RUBY
RUBY
-
+
app_file "test/functional/one_functional_test.rb", <<-RUBY
raise RuntimeError
RUBY
-
+
app_file "test/integration/one_integration_test.rb", <<-RUBY
raise RuntimeError
RUBY
-
+
silence_stderr do
output = Dir.chdir(app_path){ `rake test` }
assert_match /Errors running test:units! #<ActiveRecord::AdapterNotSpecified/, output
@@ -151,5 +151,14 @@ module ApplicationTests
assert_equal 2, ::AppTemplate::Application::Product.count
assert_equal 0, ::AppTemplate::Application::User.count
end
+
+ def test_scaffold_tests_pass_by_default
+ content = Dir.chdir(app_path) do
+ `rails generate scaffold user username:string password:string`
+ `bundle exec rake db:migrate db:test:clone test`
+ end
+
+ assert_match(/7 tests, 10 assertions, 0 failures, 0 errors/, content)
+ end
end
-end
+end \ No newline at end of file