Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md

4 files changed, 21 insertions, 2 deletions

diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 0f48c8d5fc..01d373b691 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -273,6 +273,19 @@ module ActiveRecord
     end
   end
 
+  class DatabaseTasksMigrateTest < ActiveRecord::TestCase
+    def test_migrate_receives_correct_env_vars
+      verbose, version = ENV['VERBOSE'], ENV['VERSION']
+
+      ENV['VERBOSE'] = 'false'
+      ENV['VERSION'] = '4'
+
+      ActiveRecord::Migrator.expects(:migrate).with(ActiveRecord::Migrator.migrations_paths, 4)
+      ActiveRecord::Tasks::DatabaseTasks.migrate
+    ensure
+      ENV['VERBOSE'], ENV['VERSION'] = verbose, version
+    end
+  end
 
   class DatabaseTasksPurgeTest < ActiveRecord::TestCase
     include DatabaseTasksSetupper
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 3e3a2828f3..f58535f044 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 
+if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
 module ActiveRecord
   class MysqlDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -196,8 +197,8 @@ module ActiveRecord
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
     end
 
-    def test_establishes_connection_to_test_database
-      ActiveRecord::Base.expects(:establish_connection).with(:test)
+    def test_establishes_connection_to_the_appropriate_database
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
 
       ActiveRecord::Tasks::DatabaseTasks.purge @configuration
     end
@@ -307,3 +308,4 @@ module ActiveRecord
   end
 
 end
+end
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index 6ea225178f..0d574d071c 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 
+if current_adapter?(:PostgreSQLAdapter)
 module ActiveRecord
   class PostgreSQLDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -241,3 +242,4 @@ module ActiveRecord
   end
 
 end
+end
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index da3471adf9..750d5e42dc 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -1,6 +1,7 @@
 require 'cases/helper'
 require 'pathname'
 
+if current_adapter?(:SQLite3Adapter)
 module ActiveRecord
   class SqliteDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -189,3 +190,4 @@ module ActiveRecord
     end
   end
 end
+end