Merge pull request #13478 from schneems/schneems/fix-mysql

Move mysql2 test for when adapter will be loaded
rails · Dec 25, 2013 · 278bbfd · 278bbfd
2 parents 2aceccf + 8e2c080
commit 278bbfd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -23,13 +23,6 @@ def test_bad_connection_mysql
         end
       end
 
-      def test_bad_connection_mysql2
-        assert_raise ActiveRecord::NoDatabaseError do
-          connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db")
-          connection.exec_query('drop table if exists ex')
-        end
-      end
-
       def test_valid_column
         column = @conn.columns('ex').find { |col| col.name == 'id' }
         assert @conn.valid_type?(column.type)

diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -13,6 +13,13 @@ def teardown
     super
   end
 
+  def test_bad_connection
+    assert_raise ActiveRecord::NoDatabaseError do
+      connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db")
+      connection.exec_query('drop table if exists ex')
+    end
+  end
+
   def test_no_automatic_reconnection_after_timeout
     assert @connection.active?
     @connection.update('set @@wait_timeout=1')