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

Changeset 8661

Show
Ignore:
Timestamp:
01/18/08 07:31:37 (6 months ago)
Author:
bitsweat
Message:

Fix paths

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/activerecord/test/cases/aaa_create_tables_test.rb

    r8660 r8661  
    66 
    77  def setup 
    8     @base_path = "#{File.dirname(__FILE__)}/fixtures/db_definitions
     8    @base_path = "#{File.dirname(__FILE__)}/../schema
    99  end 
    1010 
     
    1616  def test_load_schema 
    1717    if ActiveRecord::Base.connection.supports_migrations? 
    18       eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema.rb")) 
     18      eval(File.read("#{File.dirname(__FILE__)}/../schema/schema.rb")) 
    1919    else 
    2020      recreate ActiveRecord::Base, '3' 
     
    2525  def test_drop_and_create_courses_table 
    2626    if Course.connection.supports_migrations? 
    27       eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema2.rb")) 
     27      eval(File.read("#{File.dirname(__FILE__)}/../schema/schema2.rb")) 
    2828    end 
    2929    recreate Course, '2' unless use_migrations_for_courses? 
  • trunk/activerecord/test/cases/adapter_test_sqlserver.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/default' 
    3 require 'fixtures/post' 
    4 require 'fixtures/task' 
     2require 'models/default' 
     3require 'models/post' 
     4require 'models/task' 
    55 
    66class SqlServerAdapterTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/adapter_test.rb

    r8660 r8661  
    8484  # test resetting sequences in odd tables in postgreSQL 
    8585  if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!) 
    86     require 'fixtures/movie' 
    87     require 'fixtures/subscriber' 
     86    require 'models/movie' 
     87    require 'models/subscriber' 
    8888 
    8989    def test_reset_empty_table_with_custom_pk 
  • trunk/activerecord/test/cases/associations_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/developer' 
    3 require 'fixtures/project' 
    4 require 'fixtures/company' 
    5 require 'fixtures/topic' 
    6 require 'fixtures/reply' 
    7 require 'fixtures/computer' 
    8 require 'fixtures/customer' 
    9 require 'fixtures/order' 
    10 require 'fixtures/categorization' 
    11 require 'fixtures/category' 
    12 require 'fixtures/post' 
    13 require 'fixtures/author' 
    14 require 'fixtures/comment' 
    15 require 'fixtures/tag' 
    16 require 'fixtures/tagging' 
    17 require 'fixtures/person' 
    18 require 'fixtures/reader' 
     2require 'models/developer' 
     3require 'models/project' 
     4require 'models/company' 
     5require 'models/topic' 
     6require 'models/reply' 
     7require 'models/computer' 
     8require 'models/customer' 
     9require 'models/order' 
     10require 'models/categorization' 
     11require 'models/category' 
     12require 'models/post' 
     13require 'models/author' 
     14require 'models/comment' 
     15require 'models/tag' 
     16require 'models/tagging' 
     17require 'models/person' 
     18require 'models/reader' 
    1919 
    2020class AssociationsTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/associations/inner_join_association_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/post' 
    3 require 'fixtures/comment' 
    4 require 'fixtures/author' 
    5 require 'fixtures/category' 
    6 require 'fixtures/categorization' 
     2require 'models/post' 
     3require 'models/comment' 
     4require 'models/author' 
     5require 'models/category' 
     6require 'models/categorization' 
    77 
    88class InnerJoinAssociationTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/associations/join_model_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/tag' 
    3 require 'fixtures/tagging' 
    4 require 'fixtures/post' 
    5 require 'fixtures/item' 
    6 require 'fixtures/comment' 
    7 require 'fixtures/author' 
    8 require 'fixtures/category' 
    9 require 'fixtures/categorization' 
    10 require 'fixtures/vertex' 
    11 require 'fixtures/edge' 
    12 require 'fixtures/book' 
    13 require 'fixtures/citation' 
     2require 'models/tag' 
     3require 'models/tagging' 
     4require 'models/post' 
     5require 'models/item' 
     6require 'models/comment' 
     7require 'models/author' 
     8require 'models/category' 
     9require 'models/categorization' 
     10require 'models/vertex' 
     11require 'models/edge' 
     12require 'models/book' 
     13require 'models/citation' 
    1414 
    1515class AssociationsJoinModelTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/attribute_methods_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
     2require 'models/topic' 
    33 
    44class AttributeMethodsTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/base_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
    4 require 'fixtures/company' 
    5 require 'fixtures/customer' 
    6 require 'fixtures/developer' 
    7 require 'fixtures/project' 
    8 require 'fixtures/default' 
    9 require 'fixtures/auto_id' 
    10 require 'fixtures/column_name' 
    11 require 'fixtures/subscriber' 
    12 require 'fixtures/keyboard' 
    13 require 'fixtures/post' 
    14 require 'fixtures/minimalistic' 
    15 require 'fixtures/warehouse_thing' 
     2require 'models/topic' 
     3require 'models/reply' 
     4require 'models/company' 
     5require 'models/customer' 
     6require 'models/developer' 
     7require 'models/project' 
     8require 'models/default' 
     9require 'models/auto_id' 
     10require 'models/column_name' 
     11require 'models/subscriber' 
     12require 'models/keyboard' 
     13require 'models/post' 
     14require 'models/minimalistic' 
     15require 'models/warehouse_thing' 
    1616require 'rexml/document' 
    1717 
  • trunk/activerecord/test/cases/binary_test.rb

    r8660 r8661  
    99# is limited to 32KB. 
    1010unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter) 
    11   require 'fixtures/binary' 
     11  require 'models/binary' 
    1212 
    1313  class BinaryTest < ActiveSupport::TestCase 
     
    1818 
    1919      FIXTURES.each do |filename| 
    20         data = File.read("#{File.dirname(__FILE__)}/fixtures/#{filename}").freeze 
     20        data = File.read("#{File.dirname(__FILE__)}/../assets/#{filename}").freeze 
    2121 
    2222        bin = Binary.new(:data => data) 
  • trunk/activerecord/test/cases/calculations_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/company' 
    3 require 'fixtures/topic' 
     2require 'models/company' 
     3require 'models/topic' 
    44 
    55Company.has_many :accounts 
  • trunk/activerecord/test/cases/column_alias_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
     2require 'models/topic' 
    33 
    44class TestColumnAlias < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/connection_test_firebird.rb

    r8660 r8661  
    1 require "#{File.dirname(__FILE__)}/abstract_unit" 
     1require 'abstract_unit' 
    22 
    33class FirebirdConnectionTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/connection_test_mysql.rb

    r8660 r8661  
    1 require "#{File.dirname(__FILE__)}/abstract_unit" 
     1require 'abstract_unit' 
    22 
    33class MysqlConnectionTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/date_time_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/task' 
     2require 'models/topic' 
     3require 'models/task' 
    44 
    55class DateTimeTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/default_test_firebird.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/default' 
     2require 'models/default' 
    33 
    44class DefaultTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/defaults_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/default' 
    3 require 'fixtures/entrant' 
     2require 'models/default' 
     3require 'models/entrant' 
    44 
    55class DefaultTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/deprecated_finder_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/entrant' 
     2require 'models/entrant' 
    33 
    44class DeprecatedFinderTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/finder_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/author' 
    3 require 'fixtures/comment' 
    4 require 'fixtures/company' 
    5 require 'fixtures/topic' 
    6 require 'fixtures/reply' 
    7 require 'fixtures/entrant' 
    8 require 'fixtures/developer' 
    9 require 'fixtures/post' 
     2require 'models/author' 
     3require 'models/comment' 
     4require 'models/company' 
     5require 'models/topic' 
     6require 'models/reply' 
     7require 'models/entrant' 
     8require 'models/developer' 
     9require 'models/post' 
    1010 
    1111class FinderTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/fixtures_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/post' 
    3 require 'fixtures/binary' 
    4 require 'fixtures/topic' 
    5 require 'fixtures/computer' 
    6 require 'fixtures/developer' 
    7 require 'fixtures/company' 
    8 require 'fixtures/task' 
    9 require 'fixtures/reply' 
    10 require 'fixtures/joke' 
    11 require 'fixtures/course' 
    12 require 'fixtures/category' 
    13 require 'fixtures/parrot' 
    14 require 'fixtures/pirate' 
    15 require 'fixtures/treasure' 
    16 require 'fixtures/matey' 
    17 require 'fixtures/ship' 
     2require 'models/post' 
     3require 'models/binary' 
     4require 'models/topic' 
     5require 'models/computer' 
     6require 'models/developer' 
     7require 'models/company' 
     8require 'models/task' 
     9require 'models/reply' 
     10require 'models/joke' 
     11require 'models/course' 
     12require 'models/category' 
     13require 'models/parrot' 
     14require 'models/pirate' 
     15require 'models/treasure' 
     16require 'models/matey' 
     17require 'models/ship' 
    1818 
    1919class FixturesTest < ActiveSupport::TestCase 
     
    2828  MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/ 
    2929 
    30   BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures/flowers.jpg' 
     30  BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/../assets/flowers.jpg' 
    3131 
    3232  def test_clean_fixtures 
     
    141141 
    142142  def test_empty_yaml_fixture 
    143     assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/yml/accounts") 
     143    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/yml/accounts") 
    144144  end 
    145145 
    146146  def test_empty_yaml_fixture_with_a_comment_in_it 
    147     assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/fixtures/naked/yml/companies") 
     147    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/../fixtures/naked/yml/companies") 
    148148  end 
    149149 
    150150  def test_dirty_dirty_yaml_file 
    151151    assert_raises(Fixture::FormatError) do 
    152       Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/fixtures/naked/yml/courses") 
     152      Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/../fixtures/naked/yml/courses") 
    153153    end 
    154154  end 
    155155 
    156156  def test_empty_csv_fixtures 
    157     assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/csv/accounts") 
     157    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/csv/accounts") 
    158158  end 
    159159 
    160160  def test_omap_fixtures 
    161161    assert_nothing_raised do 
    162       fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/fixtures/categories_ordered') 
     162      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/../fixtures/categories_ordered') 
    163163 
    164164      i = 0 
     
    431431 
    432432class LoadAllFixturesTest < ActiveSupport::TestCase 
    433   self.fixture_path= File.join(File.dirname(__FILE__), '/fixtures/all') 
     433  self.fixture_path= File.join(File.dirname(__FILE__), '/../fixtures/all') 
    434434  fixtures :all 
    435435 
  • trunk/activerecord/test/cases/inheritance_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/company' 
    3 require 'fixtures/project' 
    4 require 'fixtures/subscriber' 
     2require 'models/company' 
     3require 'models/project' 
     4require 'models/subscriber' 
    55 
    66class InheritanceTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/json_serialization_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/contact' 
    3 require 'fixtures/post' 
    4 require 'fixtures/author' 
    5 require 'fixtures/tagging' 
    6 require 'fixtures/tag' 
    7 require 'fixtures/comment' 
     2require 'models/contact' 
     3require 'models/post' 
     4require 'models/author' 
     5require 'models/tagging' 
     6require 'models/tag' 
     7require 'models/comment' 
    88 
    99class JsonSerializationTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/lifecycle_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/developer' 
    4 require 'fixtures/reply' 
     2require 'models/topic' 
     3require 'models/developer' 
     4require 'models/reply' 
    55 
    66class Topic; def after_find() end end 
  • trunk/activerecord/test/cases/locking_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/person' 
    3 require 'fixtures/reader' 
    4 require 'fixtures/legacy_thing' 
     2require 'models/person' 
     3require 'models/reader' 
     4require 'models/legacy_thing' 
    55 
    66class LockWithoutDefault < ActiveRecord::Base; end 
  • trunk/activerecord/test/cases/method_scoping_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/developer' 
    3 require 'fixtures/project' 
    4 require 'fixtures/comment' 
    5 require 'fixtures/post' 
    6 require 'fixtures/category' 
     2require 'models/developer' 
     3require 'models/project' 
     4require 'models/comment' 
     5require 'models/post' 
     6require 'models/category' 
    77 
    88class MethodScopingTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/migration_test_firebird.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/course' 
     2require 'models/course' 
    33 
    44class FirebirdMigrationTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/migration_test.rb

    r8660 r8661  
    22require 'bigdecimal/util' 
    33 
    4 require 'fixtures/person' 
    5 require 'fixtures/topic' 
    6 require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names' 
    7 require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders' 
    8 require File.dirname(__FILE__) + '/fixtures/migrations_with_decimal/1_give_me_big_numbers' 
     4require 'models/person' 
     5require 'models/topic' 
     6require 'migrations/valid/1_people_have_last_names' 
     7require 'migrations/valid/2_we_need_reminders' 
     8require 'migrations/decimal/1_give_me_big_numbers' 
    99 
    1010if ActiveRecord::Base.connection.supports_migrations? 
     
    696696      assert !Reminder.table_exists? 
    697697 
    698       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/') 
     698      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid') 
    699699 
    700700      assert_equal 3, ActiveRecord::Migrator.current_version 
     
    704704      assert_equal "hello world", Reminder.find(:first).content 
    705705 
    706       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/') 
     706      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid') 
    707707 
    708708      assert_equal 0, ActiveRecord::Migrator.current_version 
     
    716716      assert !Reminder.table_exists? 
    717717 
    718       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
     718      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 
    719719 
    720720      Person.reset_column_information 
     
    722722      assert !Reminder.table_exists? 
    723723 
    724       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2) 
     724      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 2) 
    725725 
    726726      assert Reminder.create("content" => "hello world", "remind_at" => Time.now) 
     
    729729 
    730730    def test_migrator_one_down 
    731       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/') 
    732  
    733       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
     731      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid') 
     732 
     733      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 1) 
    734734 
    735735      Person.reset_column_information 
     
    739739 
    740740    def test_migrator_one_up_one_down 
    741       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
    742       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0) 
     741      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 
     742      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0) 
    743743 
    744744      assert !Person.column_methods_hash.include?(:last_name) 
     
    747747 
    748748    def test_migrator_verbosity 
    749       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
     749      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 
    750750      assert PeopleHaveLastNames.message_count > 0 
    751751      PeopleHaveLastNames.message_count = 0 
    752752 
    753       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0) 
     753      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0) 
    754754      assert PeopleHaveLastNames.message_count > 0 
    755755      PeopleHaveLastNames.message_count = 0 
     
    758758    def test_migrator_verbosity_off 
    759759      PeopleHaveLastNames.verbose = false 
    760       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
     760      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 
    761761      assert PeopleHaveLastNames.message_count.zero? 
    762       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0) 
     762      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0) 
    763763      assert PeopleHaveLastNames.message_count.zero? 
    764764    end 
    765765 
    766766    def test_migrator_going_down_due_to_version_target 
    767       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1) 
    768       ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations/', 0) 
     767      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 
     768      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/valid', 0) 
    769769 
    770770      assert !Person.column_methods_hash.include?(:last_name) 
    771771      assert !Reminder.table_exists? 
    772772 
    773       ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations/') 
     773      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/valid') 
    774774 
    775775      Person.reset_column_information 
     
    864864    def test_migrator_with_duplicates 
    865865      assert_raises(ActiveRecord::DuplicateMigrationVersionError) do 
    866         ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_duplicate/', nil) 
     866        ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/duplicate', nil) 
    867867      end 
    868868    end 
    869869 
    870870    def test_migrator_with_missing_version_numbers 
    871       ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 500) 
     871      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/missing', 500) 
    872872      assert !Person.column_methods_hash.include?(:middle_name) 
    873        assert_equal 4, ActiveRecord::Migrator.current_version 
    874  
    875                        ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 2) 
    876                        Person.reset_column_information 
    877                        assert !Reminder.table_exists? 
     873      assert_equal 4, ActiveRecord::Migrator.current_version 
     874 
     875      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/missing', 2) 
     876      Person.reset_column_information 
     877      assert !Reminder.table_exists? 
    878878      assert Person.column_methods_hash.include?(:last_name) 
    879                        assert_equal 2, ActiveRecord::Migrator.current_version 
     879      assert_equal 2, ActiveRecord::Migrator.current_version 
    880880    end 
    881881 
  • trunk/activerecord/test/cases/modules_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/company_in_module' 
     2require 'models/company_in_module' 
    33 
    44class ModulesTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/multiple_db_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/entrant' 
     2require 'models/entrant' 
    33 
    44# So we can test whether Course.connection survives a reload. 
    5 require_dependency 'fixtures/course' 
     5require_dependency 'models/course' 
    66 
    77class MultipleDbTest < ActiveSupport::TestCase 
     
    5454    Dependencies.clear 
    5555    Object.send(:remove_const, :Course) 
    56     require_dependency 'fixtures/course' 
     56    require_dependency 'models/course' 
    5757 
    5858    assert Course.connection 
  • trunk/activerecord/test/cases/pk_test.rb

    r8660 r8661  
    1 require "#{File.dirname(__FILE__)}/abstract_unit" 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
    4 require 'fixtures/subscriber' 
    5 require 'fixtures/movie' 
    6 require 'fixtures/keyboard' 
    7 require 'fixtures/mixed_case_monkey' 
     1require 'abstract_unit' 
     2require 'models/topic' 
     3require 'models/reply' 
     4require 'models/subscriber' 
     5require 'models/movie' 
     6require 'models/keyboard' 
     7require 'models/mixed_case_monkey' 
    88 
    99class PrimaryKeysTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/query_cache_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
    4 require 'fixtures/task' 
    5 require 'fixtures/course' 
    6 require 'fixtures/category' 
    7 require 'fixtures/post' 
     2require 'models/topic' 
     3require 'models/reply' 
     4require 'models/task' 
     5require 'models/course' 
     6require 'models/category' 
     7require 'models/post' 
    88 
    99 
  • trunk/activerecord/test/cases/readonly_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/post' 
    3 require 'fixtures/comment' 
    4 require 'fixtures/developer' 
    5 require 'fixtures/project' 
    6 require 'fixtures/reader' 
    7 require 'fixtures/person' 
     2require 'models/post' 
     3require 'models/comment' 
     4require 'models/developer' 
     5require 'models/project' 
     6require 'models/reader' 
     7require 'models/person' 
    88 
    99# Dummy class methods to test implicit association scoping. 
  • trunk/activerecord/test/cases/reflection_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/customer' 
    4 require 'fixtures/company' 
    5 require 'fixtures/company_in_module' 
    6 require 'fixtures/subscriber' 
     2require 'models/topic' 
     3require 'models/customer' 
     4require 'models/company' 
     5require 'models/company_in_module' 
     6require 'models/subscriber' 
    77 
    88class ReflectionTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/reserved_word_test_mysql.rb

    r8660 r8661  
    1 require "#{File.dirname(__FILE__)}/abstract_unit" 
     1require 'abstract_unit' 
    22 
    33class Group < ActiveRecord::Base 
  • trunk/activerecord/test/cases/schema_dumper_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require "#{File.dirname(__FILE__)}/../lib/active_record/schema_dumper" 
     2require 'active_record/schema_dumper' 
    33require 'stringio' 
    44 
  • trunk/activerecord/test/cases/serialization_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/contact' 
     2require 'models/contact' 
    33 
    44class SerializationTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/synonym_test_oracle.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/subject' 
     2require 'models/topic' 
     3require 'models/subject' 
    44 
    55# confirm that synonyms work just like tables; in this case 
  • trunk/activerecord/test/cases/table_name_test_sqlserver.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require "#{File.dirname(__FILE__)}/../lib/active_record/schema" 
     2require 'active_record/schema' 
    33 
    44if ActiveRecord::Base.connection.supports_migrations? 
  • trunk/activerecord/test/cases/threaded_connections_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
     2require 'models/topic' 
     3require 'models/reply' 
    44 
    55unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name 
  • trunk/activerecord/test/cases/transactions_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
    4 require 'fixtures/developer' 
     2require 'models/topic' 
     3require 'models/reply' 
     4require 'models/developer' 
    55 
    66class TransactionTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/cases/validations_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/topic' 
    3 require 'fixtures/reply' 
    4 require 'fixtures/person' 
    5 require 'fixtures/developer' 
    6 require 'fixtures/warehouse_thing' 
     2require 'models/topic' 
     3require 'models/reply' 
     4require 'models/person' 
     5require 'models/developer' 
     6require 'models/warehouse_thing' 
    77 
    88# The following methods in Topic are used in test_conditional_validation_* 
  • trunk/activerecord/test/cases/xml_serialization_test.rb

    r8660 r8661  
    11require 'abstract_unit' 
    2 require 'fixtures/contact' 
    3 require 'fixtures/post' 
    4 require 'fixtures/author' 
    5 require 'fixtures/tagging' 
    6 require 'fixtures/comment' 
     2require 'models/contact' 
     3require 'models/post' 
     4require 'models/author' 
     5require 'models/tagging' 
     6require 'models/comment' 
    77 
    88class XmlSerializationTest < ActiveSupport::TestCase 
  • trunk/activerecord/test/connections/native_sqlite3/in_memory_connection.rb

    r8660 r8661  
    99def make_connection(clazz, db_definitions_file) 
    1010  clazz.establish_connection(:adapter => 'sqlite3', :database  => ':memory:') 
    11   File.read("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/#{db_definitions_file}").split(';').each do |command| 
     11  File.read("#{File.dirname(__FILE__)}/../../schema/#{db_definitions_file}").split(';').each do |command| 
    1212    clazz.connection.execute(command) unless command.strip.empty? 
    1313  end 
     
    1616make_connection(ActiveRecord::Base, 'sqlite.sql') 
    1717make_connection(Course, 'sqlite2.sql') 
    18 load("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/schema.rb") 
     18load("#{File.dirname(__FILE__)}/../../schema/schema.rb") 
  • trunk/activerecord/test/models/reply.rb

    r8657 r8661  
    1 require 'fixtures/topic' 
     1require 'models/topic' 
    22