Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #11106: changes_to_sqlserver_adapter_to_support_new_ar_test_arrangements.diff

File changes_to_sqlserver_adapter_to_support_new_ar_test_arrangements.diff, 2.8 kB (added by h-lame, 7 months ago)

tidying up the sqlserver adapter tests to match with [8681]

  • test/connections/native_sqlserver_odbc/connection.rb

    old new  
    11print "Using native SQLServer via ODBC\n" 
    2 require_dependency 'fixtures/course' 
     2require_dependency 'models/course' 
    33require 'logger' 
    44 
    55ActiveRecord::Base.logger = Logger.new("debug.log") 
  • test/connections/native_sqlserver/connection.rb

    old new  
    11print "Using native SQLServer\n" 
    2 require_dependency 'fixtures/course' 
     2require_dependency 'models/course' 
    33require 'logger' 
    44 
    55ActiveRecord::Base.logger = Logger.new("debug.log") 
  • test/affected_rows_test_sqlserver.rb

    old new  
    1 require 'abstract_unit
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
     1require 'cases/helper
     2require 'models/topic' 
     3require 'models/reply' 
    44 
    5 class AffectedRowsTestSqlserver < Test::Unit::TestCase 
     5class AffectedRowsTestSqlserver < ActiveRecord::TestCase 
    66  self.use_transactional_fixtures = false 
    77  fixtures :topics 
    88 
  • test/aaaa_create_tables_test_sqlserver.rb

    old new  
    11# The filename begins with "aaaa" to ensure this is the first test. 
    2 require 'abstract_unit
     2require 'cases/helper
    33 
    4 class AAAACreateTablesTestSqlserver < Test::Unit::TestCase 
     4class AAAACreateTablesTestSqlserver < ActiveRecord::TestCase 
    55  self.use_transactional_fixtures = false 
    66 
    77  def setup 
    8     @ar_path = "../../../rails/activerecord/test/fixtures/db_definitions
     8    @ar_path = "../../../rails/activerecord/test/schema
    99    @base_path = "#{File.dirname(__FILE__)}/fixtures/db_definitions" 
    1010  end 
    1111 
     
    2020  #FUTURE 
    2121  def __test_activerecord_load_test_schema 
    2222    #FUTURE: eval(File.read("#{@ar_path}/schema.rb")) 
    23     eval(File.read("#{@base_path}/schema.rb")) 
     23    eval(File.read("#{@ar_path}/schema.rb")) 
    2424    connection = ActiveRecord::Base.connection 
    2525    begin 
    2626      ActiveRecord::Base.connection = Course.connection 
    2727      #FUTURE: eval(File.read("#{@ar_path}/schema2.rb")) 
    28       eval(File.read("#{@base_path}/schema2.rb")) 
     28      eval(File.read("#{@ar_path}/schema2.rb")) 
    2929    ensure 
    3030      ActiveRecord::Base.connection = connection 
    3131    end