Merge pull request #7196 from rimidl/fix-incorrect-require-mysql-in-mysql_rake_test

Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test
This commit is contained in:
Aaron Patterson 2012-07-29 11:15:13 -07:00
commit 0c315c75a4

@ -1,5 +1,4 @@
require 'cases/helper'
require 'mysql'
module ActiveRecord
class MysqlDBCreateTest < ActiveRecord::TestCase
@ -46,6 +45,10 @@ def test_establishes_connection_to_database
class MysqlDBCreateAsRootTest < ActiveRecord::TestCase
def setup
unless current_adapter?(:MysqlAdapter)
return skip("only tested on mysql")
end
@connection = stub(:create_database => true, :execute => true)
@error = Mysql::Error.new "Invalid permissions"
@configuration = {
@ -64,6 +67,7 @@ def setup
end
def test_root_password_is_requested
skip "only if mysql is available" unless defined?(::Mysql)
$stdin.expects(:gets).returns("secret\n")
ActiveRecord::Tasks::DatabaseTasks.create @configuration