aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorschneems <richard.schneeman@gmail.com>2016-01-08 11:53:25 -0600
committerschneems <richard.schneeman@gmail.com>2016-01-08 14:05:20 -0600
commitd70c68d76abcbc24ef0e56b7a7b580d0013255dd (patch)
tree4c3eef7f058ae7ea341814e8869f808b7a7ef67c /railties/test
parentf6628adc11e2e57db75030fca9bae035be5cd95b (diff)
downloadrails-d70c68d76abcbc24ef0e56b7a7b580d0013255dd.tar.gz
rails-d70c68d76abcbc24ef0e56b7a7b580d0013255dd.tar.bz2
rails-d70c68d76abcbc24ef0e56b7a7b580d0013255dd.zip
Fixing tests and re-locating error checking.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/bin_setup_test.rb2
-rw-r--r--railties/test/application/rake/dbs_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index c96bbe4c70..d279f198f2 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
assert_not File.exist?("tmp/restart.txt")
`bin/setup 2>&1`
assert_equal 0, File.size("log/my.log")
- assert_equal '["articles", "schema_migrations", "internal_metadatas"]', list_tables.call
+ assert_equal '["articles", "schema_migrations", "active_record_internal_metadatas"]', list_tables.call
assert File.exist?("tmp/restart.txt")
end
end
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 47ab65e57b..1304e73378 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -222,14 +222,14 @@ module ApplicationTests
assert_equal '["posts"]', list_tables[]
`bin/rake db:schema:load`
- assert_equal '["posts", "comments", "schema_migrations", "internal_metadatas"]', list_tables[]
+ assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas"]', list_tables[]
app_file 'db/structure.sql', <<-SQL
CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
SQL
`bin/rake db:structure:load`
- assert_equal '["posts", "comments", "schema_migrations", "internal_metadatas", "users"]', list_tables[]
+ assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas", "users"]', list_tables[]
end
end