1 files changed, 47 insertions, 81 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c76bc3d526..27d521485c 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -2,7 +2,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class RakeTest < Test::Unit::TestCase
+  class RakeTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -63,26 +63,23 @@ module ApplicationTests
     def test_rake_test_error_output
       Dir.chdir(app_path){ `rake db:migrate` }
 
-      app_file "config/database.yml", <<-RUBY
-        development:
-      RUBY
-
       app_file "test/unit/one_unit_test.rb", <<-RUBY
+        raise 'unit'
       RUBY
 
       app_file "test/functional/one_functional_test.rb", <<-RUBY
-        raise RuntimeError
+        raise 'functional'
       RUBY
 
       app_file "test/integration/one_integration_test.rb", <<-RUBY
-        raise RuntimeError
+        raise 'integration'
       RUBY
 
       silence_stderr do
-        output = Dir.chdir(app_path){ `rake test` }
-        assert_match(/Errors running test:units! #<ActiveRecord::AdapterNotSpecified/, output)
-        assert_match(/Errors running test:functionals! #<RuntimeError/, output)
-        assert_match(/Errors running test:integration! #<RuntimeError/, output)
+        output = Dir.chdir(app_path) { `rake test 2>&1` }
+        assert_match 'unit', output
+        assert_match 'functional', output
+        assert_match 'integration', output
       end
     end
 
@@ -108,98 +105,67 @@ module ApplicationTests
       assert_match "Sample log message", output
     end
 
-    def test_model_and_migration_generator_with_change_syntax
+    def test_loading_specific_fixtures
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+        `rails generate model user username:string password:string;
+         rails generate model product name:string;
+         rake db:migrate`
       end
 
-      output = Dir.chdir(app_path){ `rake db:migrate` }
-      assert_match(/create_table\(:users\)/, output)
-      assert_match(/CreateUsers: migrated/, output)
-      assert_match(/add_column\(:users, :email, :string\)/, output)
-      assert_match(/AddEmailToUsers: migrated/, output)
-
-      output = Dir.chdir(app_path){ `rake db:rollback STEP=2` }
-      assert_match(/drop_table\("users"\)/, output)
-      assert_match(/CreateUsers: reverted/, output)
-      assert_match(/remove_column\("users", :email\)/, output)
-      assert_match(/AddEmailToUsers: reverted/, output)
-    end
+      require "#{rails_root}/config/environment"
+
+      # loading a specific fixture
+      errormsg = Dir.chdir(app_path) { `rake db:fixtures:load FIXTURES=products` }
+      assert $?.success?, errormsg
 
-    def test_migration_status_when_schema_migrations_table_is_not_present
-      output = Dir.chdir(app_path){ `rake db:migrate:status` }
-      assert_equal "Schema migrations table does not exist yet.\n", output
+      assert_equal 2, ::AppTemplate::Application::Product.count
+      assert_equal 0, ::AppTemplate::Application::User.count
     end
 
-    def test_migration_status
-      Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+    def test_scaffold_tests_pass_by_default
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string password:string;
+         bundle exec rake db:migrate db:test:clone test`
       end
 
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
-
-      Dir.chdir(app_path) { `rake db:rollback STEP=1` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_no_match(/Errors running/, output)
     end
 
-    def test_migration_status_after_rollback_and_redo
+    def test_rake_dump_structure_should_respect_db_structure_env_variable
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+        # ensure we have a schema_migrations table to dump
+        `bundle exec rake db:migrate db:structure:dump DB_STRUCTURE=db/my_structure.sql`
       end
+      assert File.exists?(File.join(app_path, 'db', 'my_structure.sql'))
+    end
 
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
-
-      Dir.chdir(app_path) { `rake db:rollback STEP=2` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/down\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+    def test_rake_dump_structure_should_be_called_twice_when_migrate_redo
+      add_to_config "config.active_record.schema_format = :sql"
 
-      Dir.chdir(app_path) { `rake db:migrate:redo` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+      output = Dir.chdir(app_path) do
+        `rails g model post title:string;
+         bundle exec rake db:migrate:redo 2>&1 --trace;`
+      end
 
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+      # expect only Invoke db:structure:dump (first_time)
+      assert_no_match(/^\*\* Invoke db:structure:dump\s+$/, output)
     end
 
-    def test_loading_specific_fixtures
+    def test_rake_dump_schema_cache
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate model product name:string`
-        `rake db:migrate`
+        `rails generate model post title:string;
+         rails generate model product name:string;
+         bundle exec rake db:migrate db:schema:cache:dump`
       end
-
-      require "#{rails_root}/config/environment"
-
-      # loading a specific fixture
-      errormsg = Dir.chdir(app_path) { `rake db:fixtures:load FIXTURES=products` }
-      assert $?.success?, errormsg
-
-      assert_equal 2, ::AppTemplate::Application::Product.count
-      assert_equal 0, ::AppTemplate::Application::User.count
+      assert File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
-    def test_scaffold_tests_pass_by_default
-      content = Dir.chdir(app_path) do
-        `rails generate scaffold user username:string password:string`
-        `bundle exec rake db:migrate db:test:clone test`
+    def test_rake_clear_schema_cache
+      Dir.chdir(app_path) do
+        `bundle exec rake db:schema:cache:dump db:schema:cache:clear`
       end
-
-      assert_match(/7 tests, 10 assertions, 0 failures, 0 errors/, content)
+      assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
   end
 end