Changeset 8661
- Timestamp:
- 01/18/08 07:31:37 (6 months ago)
- Files:
-
- trunk/activerecord/test/cases/aaa_create_tables_test.rb (modified) (3 diffs)
- trunk/activerecord/test/cases/adapter_test_sqlserver.rb (modified) (1 diff)
- trunk/activerecord/test/cases/adapter_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/associations_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/associations/inner_join_association_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/associations/join_model_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/attribute_methods_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/base_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/binary_test.rb (modified) (2 diffs)
- trunk/activerecord/test/cases/calculations_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/column_alias_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/connection_test_firebird.rb (modified) (1 diff)
- trunk/activerecord/test/cases/connection_test_mysql.rb (modified) (1 diff)
- trunk/activerecord/test/cases/date_time_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/default_test_firebird.rb (modified) (1 diff)
- trunk/activerecord/test/cases/defaults_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/deprecated_finder_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/finder_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/fixtures_test.rb (modified) (4 diffs)
- trunk/activerecord/test/cases/inheritance_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/json_serialization_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/lifecycle_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/locking_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/method_scoping_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/migration_test_firebird.rb (modified) (1 diff)
- trunk/activerecord/test/cases/migration_test.rb (modified) (10 diffs)
- trunk/activerecord/test/cases/modules_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/multiple_db_test.rb (modified) (2 diffs)
- trunk/activerecord/test/cases/pk_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/query_cache_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/readonly_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/reflection_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/reserved_word_test_mysql.rb (modified) (1 diff)
- trunk/activerecord/test/cases/schema_dumper_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/serialization_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/synonym_test_oracle.rb (modified) (1 diff)
- trunk/activerecord/test/cases/table_name_test_sqlserver.rb (modified) (1 diff)
- trunk/activerecord/test/cases/threaded_connections_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/transactions_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/validations_test.rb (modified) (1 diff)
- trunk/activerecord/test/cases/xml_serialization_test.rb (modified) (1 diff)
- trunk/activerecord/test/connections/native_sqlite3/in_memory_connection.rb (modified) (2 diffs)
- trunk/activerecord/test/models/reply.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/test/cases/aaa_create_tables_test.rb
r8660 r8661 6 6 7 7 def setup 8 @base_path = "#{File.dirname(__FILE__)}/ fixtures/db_definitions"8 @base_path = "#{File.dirname(__FILE__)}/../schema" 9 9 end 10 10 … … 16 16 def test_load_schema 17 17 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")) 19 19 else 20 20 recreate ActiveRecord::Base, '3' … … 25 25 def test_drop_and_create_courses_table 26 26 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")) 28 28 end 29 29 recreate Course, '2' unless use_migrations_for_courses? trunk/activerecord/test/cases/adapter_test_sqlserver.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/default'3 require ' fixtures/post'4 require ' fixtures/task'2 require 'models/default' 3 require 'models/post' 4 require 'models/task' 5 5 6 6 class SqlServerAdapterTest < ActiveSupport::TestCase trunk/activerecord/test/cases/adapter_test.rb
r8660 r8661 84 84 # test resetting sequences in odd tables in postgreSQL 85 85 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' 88 88 89 89 def test_reset_empty_table_with_custom_pk trunk/activerecord/test/cases/associations_test.rb
r8660 r8661 1 1 require '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'2 require 'models/developer' 3 require 'models/project' 4 require 'models/company' 5 require 'models/topic' 6 require 'models/reply' 7 require 'models/computer' 8 require 'models/customer' 9 require 'models/order' 10 require 'models/categorization' 11 require 'models/category' 12 require 'models/post' 13 require 'models/author' 14 require 'models/comment' 15 require 'models/tag' 16 require 'models/tagging' 17 require 'models/person' 18 require 'models/reader' 19 19 20 20 class AssociationsTest < ActiveSupport::TestCase trunk/activerecord/test/cases/associations/inner_join_association_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/post'3 require ' fixtures/comment'4 require ' fixtures/author'5 require ' fixtures/category'6 require ' fixtures/categorization'2 require 'models/post' 3 require 'models/comment' 4 require 'models/author' 5 require 'models/category' 6 require 'models/categorization' 7 7 8 8 class InnerJoinAssociationTest < ActiveSupport::TestCase trunk/activerecord/test/cases/associations/join_model_test.rb
r8660 r8661 1 1 require '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'2 require 'models/tag' 3 require 'models/tagging' 4 require 'models/post' 5 require 'models/item' 6 require 'models/comment' 7 require 'models/author' 8 require 'models/category' 9 require 'models/categorization' 10 require 'models/vertex' 11 require 'models/edge' 12 require 'models/book' 13 require 'models/citation' 14 14 15 15 class AssociationsJoinModelTest < ActiveSupport::TestCase trunk/activerecord/test/cases/attribute_methods_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'2 require 'models/topic' 3 3 4 4 class AttributeMethodsTest < ActiveSupport::TestCase trunk/activerecord/test/cases/base_test.rb
r8660 r8661 1 1 require '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'2 require 'models/topic' 3 require 'models/reply' 4 require 'models/company' 5 require 'models/customer' 6 require 'models/developer' 7 require 'models/project' 8 require 'models/default' 9 require 'models/auto_id' 10 require 'models/column_name' 11 require 'models/subscriber' 12 require 'models/keyboard' 13 require 'models/post' 14 require 'models/minimalistic' 15 require 'models/warehouse_thing' 16 16 require 'rexml/document' 17 17 trunk/activerecord/test/cases/binary_test.rb
r8660 r8661 9 9 # is limited to 32KB. 10 10 unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter) 11 require ' fixtures/binary'11 require 'models/binary' 12 12 13 13 class BinaryTest < ActiveSupport::TestCase … … 18 18 19 19 FIXTURES.each do |filename| 20 data = File.read("#{File.dirname(__FILE__)}/ fixtures/#{filename}").freeze20 data = File.read("#{File.dirname(__FILE__)}/../assets/#{filename}").freeze 21 21 22 22 bin = Binary.new(:data => data) trunk/activerecord/test/cases/calculations_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/company'3 require ' fixtures/topic'2 require 'models/company' 3 require 'models/topic' 4 4 5 5 Company.has_many :accounts trunk/activerecord/test/cases/column_alias_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'2 require 'models/topic' 3 3 4 4 class TestColumnAlias < ActiveSupport::TestCase trunk/activerecord/test/cases/connection_test_firebird.rb
r8660 r8661 1 require "#{File.dirname(__FILE__)}/abstract_unit"1 require 'abstract_unit' 2 2 3 3 class FirebirdConnectionTest < ActiveSupport::TestCase trunk/activerecord/test/cases/connection_test_mysql.rb
r8660 r8661 1 require "#{File.dirname(__FILE__)}/abstract_unit"1 require 'abstract_unit' 2 2 3 3 class MysqlConnectionTest < ActiveSupport::TestCase trunk/activerecord/test/cases/date_time_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/task'2 require 'models/topic' 3 require 'models/task' 4 4 5 5 class DateTimeTest < ActiveSupport::TestCase trunk/activerecord/test/cases/default_test_firebird.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/default'2 require 'models/default' 3 3 4 4 class DefaultTest < ActiveSupport::TestCase trunk/activerecord/test/cases/defaults_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/default'3 require ' fixtures/entrant'2 require 'models/default' 3 require 'models/entrant' 4 4 5 5 class DefaultTest < ActiveSupport::TestCase trunk/activerecord/test/cases/deprecated_finder_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/entrant'2 require 'models/entrant' 3 3 4 4 class DeprecatedFinderTest < ActiveSupport::TestCase trunk/activerecord/test/cases/finder_test.rb
r8660 r8661 1 1 require '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'2 require 'models/author' 3 require 'models/comment' 4 require 'models/company' 5 require 'models/topic' 6 require 'models/reply' 7 require 'models/entrant' 8 require 'models/developer' 9 require 'models/post' 10 10 11 11 class FinderTest < ActiveSupport::TestCase trunk/activerecord/test/cases/fixtures_test.rb
r8660 r8661 1 1 require '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'2 require 'models/post' 3 require 'models/binary' 4 require 'models/topic' 5 require 'models/computer' 6 require 'models/developer' 7 require 'models/company' 8 require 'models/task' 9 require 'models/reply' 10 require 'models/joke' 11 require 'models/course' 12 require 'models/category' 13 require 'models/parrot' 14 require 'models/pirate' 15 require 'models/treasure' 16 require 'models/matey' 17 require 'models/ship' 18 18 19 19 class FixturesTest < ActiveSupport::TestCase … … 28 28 MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/ 29 29 30 BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/ fixtures/flowers.jpg'30 BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/../assets/flowers.jpg' 31 31 32 32 def test_clean_fixtures … … 141 141 142 142 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") 144 144 end 145 145 146 146 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") 148 148 end 149 149 150 150 def test_dirty_dirty_yaml_file 151 151 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") 153 153 end 154 154 end 155 155 156 156 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") 158 158 end 159 159 160 160 def test_omap_fixtures 161 161 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') 163 163 164 164 i = 0 … … 431 431 432 432 class 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') 434 434 fixtures :all 435 435 trunk/activerecord/test/cases/inheritance_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/company'3 require ' fixtures/project'4 require ' fixtures/subscriber'2 require 'models/company' 3 require 'models/project' 4 require 'models/subscriber' 5 5 6 6 class InheritanceTest < ActiveSupport::TestCase trunk/activerecord/test/cases/json_serialization_test.rb
r8660 r8661 1 1 require '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'2 require 'models/contact' 3 require 'models/post' 4 require 'models/author' 5 require 'models/tagging' 6 require 'models/tag' 7 require 'models/comment' 8 8 9 9 class JsonSerializationTest < ActiveSupport::TestCase trunk/activerecord/test/cases/lifecycle_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/developer'4 require ' fixtures/reply'2 require 'models/topic' 3 require 'models/developer' 4 require 'models/reply' 5 5 6 6 class Topic; def after_find() end end trunk/activerecord/test/cases/locking_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/person'3 require ' fixtures/reader'4 require ' fixtures/legacy_thing'2 require 'models/person' 3 require 'models/reader' 4 require 'models/legacy_thing' 5 5 6 6 class LockWithoutDefault < ActiveRecord::Base; end trunk/activerecord/test/cases/method_scoping_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/developer'3 require ' fixtures/project'4 require ' fixtures/comment'5 require ' fixtures/post'6 require ' fixtures/category'2 require 'models/developer' 3 require 'models/project' 4 require 'models/comment' 5 require 'models/post' 6 require 'models/category' 7 7 8 8 class MethodScopingTest < ActiveSupport::TestCase trunk/activerecord/test/cases/migration_test_firebird.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/course'2 require 'models/course' 3 3 4 4 class FirebirdMigrationTest < ActiveSupport::TestCase trunk/activerecord/test/cases/migration_test.rb
r8660 r8661 2 2 require 'bigdecimal/util' 3 3 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'4 require 'models/person' 5 require 'models/topic' 6 require 'migrations/valid/1_people_have_last_names' 7 require 'migrations/valid/2_we_need_reminders' 8 require 'migrations/decimal/1_give_me_big_numbers' 9 9 10 10 if ActiveRecord::Base.connection.supports_migrations? … … 696 696 assert !Reminder.table_exists? 697 697 698 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/ fixtures/migrations/')698 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid') 699 699 700 700 assert_equal 3, ActiveRecord::Migrator.current_version … … 704 704 assert_equal "hello world", Reminder.find(:first).content 705 705 706 ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/ fixtures/migrations/')706 ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid') 707 707 708 708 assert_equal 0, ActiveRecord::Migrator.current_version … … 716 716 assert !Reminder.table_exists? 717 717 718 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/ fixtures/migrations/', 1)718 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 719 719 720 720 Person.reset_column_information … … 722 722 assert !Reminder.table_exists? 723 723 724 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/ fixtures/migrations/', 2)724 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 2) 725 725 726 726 assert Reminder.create("content" => "hello world", "remind_at" => Time.now) … … 729 729 730 730 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) 734 734 735 735 Person.reset_column_information … … 739 739 740 740 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) 743 743 744 744 assert !Person.column_methods_hash.include?(:last_name) … … 747 747 748 748 def test_migrator_verbosity 749 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/ fixtures/migrations/', 1)749 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 750 750 assert PeopleHaveLastNames.message_count > 0 751 751 PeopleHaveLastNames.message_count = 0 752 752 753 ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/ fixtures/migrations/', 0)753 ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0) 754 754 assert PeopleHaveLastNames.message_count > 0 755 755 PeopleHaveLastNames.message_count = 0 … … 758 758 def test_migrator_verbosity_off 759 759 PeopleHaveLastNames.verbose = false 760 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/ fixtures/migrations/', 1)760 ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1) 761 761 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) 763 763 assert PeopleHaveLastNames.message_count.zero? 764 764 end 765 765 766 766 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) 769 769 770 770 assert !Person.column_methods_hash.include?(:last_name) 771 771 assert !Reminder.table_exists? 772 772 773 ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/ fixtures/migrations/')773 ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/valid') 774 774 775 775 Person.reset_column_information … … 864 864 def test_migrator_with_duplicates 865 865 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) 867 867 end 868 868 end 869 869 870 870 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) 872 872 assert !Person.column_methods_hash.include?(:middle_name) 873 assert_equal 4, ActiveRecord::Migrator.current_version874 875 ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 2)876 Person.reset_column_information877 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? 878 878 assert Person.column_methods_hash.include?(:last_name) 879 assert_equal 2, ActiveRecord::Migrator.current_version879 assert_equal 2, ActiveRecord::Migrator.current_version 880 880 end 881 881 trunk/activerecord/test/cases/modules_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/company_in_module'2 require 'models/company_in_module' 3 3 4 4 class ModulesTest < ActiveSupport::TestCase trunk/activerecord/test/cases/multiple_db_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/entrant'2 require 'models/entrant' 3 3 4 4 # So we can test whether Course.connection survives a reload. 5 require_dependency ' fixtures/course'5 require_dependency 'models/course' 6 6 7 7 class MultipleDbTest < ActiveSupport::TestCase … … 54 54 Dependencies.clear 55 55 Object.send(:remove_const, :Course) 56 require_dependency ' fixtures/course'56 require_dependency 'models/course' 57 57 58 58 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'1 require 'abstract_unit' 2 require 'models/topic' 3 require 'models/reply' 4 require 'models/subscriber' 5 require 'models/movie' 6 require 'models/keyboard' 7 require 'models/mixed_case_monkey' 8 8 9 9 class PrimaryKeysTest < ActiveSupport::TestCase trunk/activerecord/test/cases/query_cache_test.rb
r8660 r8661 1 1 require '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'2 require 'models/topic' 3 require 'models/reply' 4 require 'models/task' 5 require 'models/course' 6 require 'models/category' 7 require 'models/post' 8 8 9 9 trunk/activerecord/test/cases/readonly_test.rb
r8660 r8661 1 1 require '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'2 require 'models/post' 3 require 'models/comment' 4 require 'models/developer' 5 require 'models/project' 6 require 'models/reader' 7 require 'models/person' 8 8 9 9 # Dummy class methods to test implicit association scoping. trunk/activerecord/test/cases/reflection_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/customer'4 require ' fixtures/company'5 require ' fixtures/company_in_module'6 require ' fixtures/subscriber'2 require 'models/topic' 3 require 'models/customer' 4 require 'models/company' 5 require 'models/company_in_module' 6 require 'models/subscriber' 7 7 8 8 class ReflectionTest < ActiveSupport::TestCase trunk/activerecord/test/cases/reserved_word_test_mysql.rb
r8660 r8661 1 require "#{File.dirname(__FILE__)}/abstract_unit"1 require 'abstract_unit' 2 2 3 3 class Group < ActiveRecord::Base trunk/activerecord/test/cases/schema_dumper_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require "#{File.dirname(__FILE__)}/../lib/active_record/schema_dumper"2 require 'active_record/schema_dumper' 3 3 require 'stringio' 4 4 trunk/activerecord/test/cases/serialization_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/contact'2 require 'models/contact' 3 3 4 4 class SerializationTest < ActiveSupport::TestCase trunk/activerecord/test/cases/synonym_test_oracle.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/subject'2 require 'models/topic' 3 require 'models/subject' 4 4 5 5 # confirm that synonyms work just like tables; in this case trunk/activerecord/test/cases/table_name_test_sqlserver.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require "#{File.dirname(__FILE__)}/../lib/active_record/schema"2 require 'active_record/schema' 3 3 4 4 if ActiveRecord::Base.connection.supports_migrations? trunk/activerecord/test/cases/threaded_connections_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/reply'2 require 'models/topic' 3 require 'models/reply' 4 4 5 5 unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name trunk/activerecord/test/cases/transactions_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/reply'4 require ' fixtures/developer'2 require 'models/topic' 3 require 'models/reply' 4 require 'models/developer' 5 5 6 6 class TransactionTest < ActiveSupport::TestCase trunk/activerecord/test/cases/validations_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/topic'3 require ' fixtures/reply'4 require ' fixtures/person'5 require ' fixtures/developer'6 require ' fixtures/warehouse_thing'2 require 'models/topic' 3 require 'models/reply' 4 require 'models/person' 5 require 'models/developer' 6 require 'models/warehouse_thing' 7 7 8 8 # The following methods in Topic are used in test_conditional_validation_* trunk/activerecord/test/cases/xml_serialization_test.rb
r8660 r8661 1 1 require 'abstract_unit' 2 require ' fixtures/contact'3 require ' fixtures/post'4 require ' fixtures/author'5 require ' fixtures/tagging'6 require ' fixtures/comment'2 require 'models/contact' 3 require 'models/post' 4 require 'models/author' 5 require 'models/tagging' 6 require 'models/comment' 7 7 8 8 class XmlSerializationTest < ActiveSupport::TestCase trunk/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
r8660 r8661 9 9 def make_connection(clazz, db_definitions_file) 10 10 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| 12 12 clazz.connection.execute(command) unless command.strip.empty? 13 13 end … … 16 16 make_connection(ActiveRecord::Base, 'sqlite.sql') 17 17 make_connection(Course, 'sqlite2.sql') 18 load("#{File.dirname(__FILE__)}/../../ fixtures/db_definitions/schema.rb")18 load("#{File.dirname(__FILE__)}/../../schema/schema.rb") trunk/activerecord/test/models/reply.rb
r8657 r8661 1 require ' fixtures/topic'1 require 'models/topic' 2 2