diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:43:57 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:43:57 -0800 |
commit | 09035e622f9876cddc558ea065929cb862ca0f13 (patch) | |
tree | a562054a732e91256ddc4c458ae931be6436d9d1 /railties/test | |
parent | c7cf7f476a47c9e4c60a369efa338a1fa9d81d6c (diff) | |
parent | b23330745bddd6729f95fb8487e3ec4857e4bb58 (diff) | |
download | rails-09035e622f9876cddc558ea065929cb862ca0f13.tar.gz rails-09035e622f9876cddc558ea065929cb862ca0f13.tar.bz2 rails-09035e622f9876cddc558ea065929cb862ca0f13.zip |
Merge branch 'master' into set_binds
* master:
don't establish a new connection when testing with `sqlite3_mem`.
sqlite >= 3.8.0 supports partial indexes
Don't try to get the subclass if the inheritance column doesn't exist
Enum mappings are now exposed via class methods instead of constants.
Fix fields_for documentation with index option [ci skip]
quick pass through Active Record CHANGELOG. [ci skip]
[ci skip] Grammar correction
single quotes for controller generated routes
[ci skip] Added alias to CSRF
Set NameError#name
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/generators/controller_generator_test.rb | 4 | ||||
-rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb index 2268f04839..4b2f8539d0 100644 --- a/railties/test/generators/controller_generator_test.rb +++ b/railties/test/generators/controller_generator_test.rb @@ -67,7 +67,7 @@ class ControllerGeneratorTest < Rails::Generators::TestCase def test_add_routes run_generator - assert_file "config/routes.rb", /get "account\/foo"/, /get "account\/bar"/ + assert_file "config/routes.rb", /get 'account\/foo'/, /get 'account\/bar'/ end def test_invokes_default_template_engine_even_with_no_action @@ -91,6 +91,6 @@ class ControllerGeneratorTest < Rails::Generators::TestCase def test_namespaced_routes_are_created_in_routes run_generator ["admin/dashboard", "index"] - assert_file "config/routes.rb", /namespace :admin do\n\s+get "dashboard\/index"\n/ + assert_file "config/routes.rb", /namespace :admin do\n\s+get 'dashboard\/index'\n/ end end diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index e17925ff65..d677c21f15 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -63,7 +63,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase def test_routes_should_not_be_namespaced run_generator - assert_file "config/routes.rb", /get "account\/foo"/, /get "account\/bar"/ + assert_file "config/routes.rb", /get 'account\/foo'/, /get 'account\/bar'/ end def test_invokes_default_template_engine_even_with_no_action |