Merge pull request #6855 from kennyj/refactor_database_tasks

Refactor and improve database tasks.

1 files changed, 18 insertions, 0 deletions

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index e0ee349550..6bb50fea19 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -144,6 +144,24 @@ module ApplicationTests
       assert_no_match(/Errors running/, output)
     end
 
+    def test_db_test_clone_when_using_sql_format
+      add_to_config "config.active_record.schema_format = :sql"
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string;
+         bundle exec rake db:migrate db:test:clone 2>&1 --trace`
+      end
+      assert_match(/Execute db:test:clone_structure/, output)
+    end
+
+    def test_db_test_prepare_when_using_sql_format
+      add_to_config "config.active_record.schema_format = :sql"
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string;
+         bundle exec rake db:migrate db:test:clone 2>&1 --trace`
+      end
+      assert_match(/Execute db:test:load_structure/, output)
+    end
+
     def test_rake_dump_structure_should_respect_db_structure_env_variable
       Dir.chdir(app_path) do
         # ensure we have a schema_migrations table to dump