aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/namespaced_generators_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-07-07 00:57:01 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-07-07 00:57:01 -0700
commitc55df9301c34ae9778c6a7ffadaeeb3247017cde (patch)
tree08193c274233fd031e3417b543c88ef4a2305a2d /railties/test/generators/namespaced_generators_test.rb
parentb3da67d9a5dfbc2b39b77e5b2f0874137f8716ef (diff)
parent8fe9b43b3016f2c0e7afad8fc081bbf37f267226 (diff)
downloadrails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.tar.gz
rails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.tar.bz2
rails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.zip
Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fix
Engine table name prefix generator fix
Diffstat (limited to 'railties/test/generators/namespaced_generators_test.rb')
-rw-r--r--railties/test/generators/namespaced_generators_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 2ae9dc61a7..db2b8af217 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -99,7 +99,7 @@ class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
run_generator ["admin/account"]
assert_file "app/models/test_app/admin.rb", /module TestApp/, /module Admin/
assert_file "app/models/test_app/admin.rb", /def self\.table_name_prefix/
- assert_file "app/models/test_app/admin.rb", /'admin_'/
+ assert_file "app/models/test_app/admin.rb", /'test_app_admin_'/
assert_file "app/models/test_app/admin/account.rb", /module TestApp/, /class Admin::Account < ActiveRecord::Base/
end