aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Morearty <brian@morearty.org>2012-09-23 08:54:45 -0700
committerBrian Morearty <brian@morearty.org>2012-09-23 08:54:45 -0700
commit5a76d08733da72cf1ee808a38304a9927e734765 (patch)
treef70848c05d513d5a730b39b15ad05f329672a3d0
parent263764d13a9cd4eae60d1fa9e50af57f506f3dd4 (diff)
downloadrails-5a76d08733da72cf1ee808a38304a9927e734765.tar.gz
rails-5a76d08733da72cf1ee808a38304a9927e734765.tar.bz2
rails-5a76d08733da72cf1ee808a38304a9927e734765.zip
Update test to match new non-sorting of attributes.
-rw-r--r--railties/test/generators/scaffold_controller_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 1e16f04d85..aa09343346 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -50,7 +50,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
end
assert_match(/def user_params/, content)
- assert_match(/params\.require\(:user\)\.permit\(:age, :name\)/, content)
+ assert_match(/params\.require\(:user\)\.permit\(:name, :age\)/, content)
end
end