Permalink
Browse files

Fix paths

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 42b39ae commit 1e7092801469dfa3805a838b6331183be5c550c7 @jeremy jeremy committed Jan 18, 2008
Showing with 203 additions and 203 deletions.
  1. +3 −3 activerecord/test/cases/aaa_create_tables_test.rb
  2. +2 −2 activerecord/test/cases/adapter_test.rb
  3. +3 −3 activerecord/test/cases/adapter_test_sqlserver.rb
  4. +5 −5 activerecord/test/cases/associations/inner_join_association_test.rb
  5. +12 −12 activerecord/test/cases/associations/join_model_test.rb
  6. +17 −17 activerecord/test/cases/associations_test.rb
  7. +1 −1 activerecord/test/cases/attribute_methods_test.rb
  8. +14 −14 activerecord/test/cases/base_test.rb
  9. +2 −2 activerecord/test/cases/binary_test.rb
  10. +2 −2 activerecord/test/cases/calculations_test.rb
  11. +1 −1 activerecord/test/cases/column_alias_test.rb
  12. +1 −1 activerecord/test/cases/connection_test_firebird.rb
  13. +1 −1 activerecord/test/cases/connection_test_mysql.rb
  14. +2 −2 activerecord/test/cases/date_time_test.rb
  15. +1 −1 activerecord/test/cases/default_test_firebird.rb
  16. +2 −2 activerecord/test/cases/defaults_test.rb
  17. +1 −1 activerecord/test/cases/deprecated_finder_test.rb
  18. +8 −8 activerecord/test/cases/finder_test.rb
  19. +23 −23 activerecord/test/cases/fixtures_test.rb
  20. +3 −3 activerecord/test/cases/inheritance_test.rb
  21. +6 −6 activerecord/test/cases/json_serialization_test.rb
  22. +3 −3 activerecord/test/cases/lifecycle_test.rb
  23. +3 −3 activerecord/test/cases/locking_test.rb
  24. +5 −5 activerecord/test/cases/method_scoping_test.rb
  25. +27 −27 activerecord/test/cases/migration_test.rb
  26. +1 −1 activerecord/test/cases/migration_test_firebird.rb
  27. +1 −1 activerecord/test/cases/modules_test.rb
  28. +3 −3 activerecord/test/cases/multiple_db_test.rb
  29. +7 −7 activerecord/test/cases/pk_test.rb
  30. +6 −6 activerecord/test/cases/query_cache_test.rb
  31. +6 −6 activerecord/test/cases/readonly_test.rb
  32. +5 −5 activerecord/test/cases/reflection_test.rb
  33. +1 −1 activerecord/test/cases/reserved_word_test_mysql.rb
  34. +1 −1 activerecord/test/cases/schema_dumper_test.rb
  35. +2 −2 activerecord/test/cases/serialization_test.rb
  36. +2 −2 activerecord/test/cases/synonym_test_oracle.rb
  37. +1 −1 activerecord/test/cases/table_name_test_sqlserver.rb
  38. +2 −2 activerecord/test/cases/threaded_connections_test.rb
  39. +3 −3 activerecord/test/cases/transactions_test.rb
  40. +5 −5 activerecord/test/cases/validations_test.rb
  41. +6 −6 activerecord/test/cases/xml_serialization_test.rb
  42. +2 −2 activerecord/test/connections/native_sqlite3/in_memory_connection.rb
  43. +1 −1 activerecord/test/models/reply.rb
@@ -5,7 +5,7 @@ class AAACreateTablesTest < ActiveSupport::TestCase
self.use_transactional_fixtures = false
def setup
- @base_path = "#{File.dirname(__FILE__)}/fixtures/db_definitions"
+ @base_path = "#{File.dirname(__FILE__)}/../schema"
end
def test_drop_and_create_main_tables
@@ -15,7 +15,7 @@ def test_drop_and_create_main_tables
def test_load_schema
if ActiveRecord::Base.connection.supports_migrations?
- eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema.rb"))
+ eval(File.read("#{File.dirname(__FILE__)}/../schema/schema.rb"))
else
recreate ActiveRecord::Base, '3'
end
@@ -24,7 +24,7 @@ def test_load_schema
def test_drop_and_create_courses_table
if Course.connection.supports_migrations?
- eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema2.rb"))
+ eval(File.read("#{File.dirname(__FILE__)}/../schema/schema2.rb"))
end
recreate Course, '2' unless use_migrations_for_courses?
assert true
@@ -83,8 +83,8 @@ class << @connection
# test resetting sequences in odd tables in postgreSQL
if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
- require 'fixtures/movie'
- require 'fixtures/subscriber'
+ require 'models/movie'
+ require 'models/subscriber'
def test_reset_empty_table_with_custom_pk
Movie.delete_all
@@ -1,7 +1,7 @@
require 'abstract_unit'
-require 'fixtures/default'
-require 'fixtures/post'
-require 'fixtures/task'
+require 'models/default'
+require 'models/post'
+require 'models/task'
class SqlServerAdapterTest < ActiveSupport::TestCase
class TableWithRealColumn < ActiveRecord::Base; end
@@ -1,9 +1,9 @@
require 'abstract_unit'
-require 'fixtures/post'
-require 'fixtures/comment'
-require 'fixtures/author'
-require 'fixtures/category'
-require 'fixtures/categorization'
+require 'models/post'
+require 'models/comment'
+require 'models/author'
+require 'models/category'
+require 'models/categorization'
class InnerJoinAssociationTest < ActiveSupport::TestCase
fixtures :authors, :posts, :comments, :categories, :categories_posts, :categorizations
@@ -1,16 +1,16 @@
require 'abstract_unit'
-require 'fixtures/tag'
-require 'fixtures/tagging'
-require 'fixtures/post'
-require 'fixtures/item'
-require 'fixtures/comment'
-require 'fixtures/author'
-require 'fixtures/category'
-require 'fixtures/categorization'
-require 'fixtures/vertex'
-require 'fixtures/edge'
-require 'fixtures/book'
-require 'fixtures/citation'
+require 'models/tag'
+require 'models/tagging'
+require 'models/post'
+require 'models/item'
+require 'models/comment'
+require 'models/author'
+require 'models/category'
+require 'models/categorization'
+require 'models/vertex'
+require 'models/edge'
+require 'models/book'
+require 'models/citation'
class AssociationsJoinModelTest < ActiveSupport::TestCase
self.use_transactional_fixtures = false
@@ -1,21 +1,21 @@
require 'abstract_unit'
-require 'fixtures/developer'
-require 'fixtures/project'
-require 'fixtures/company'
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/computer'
-require 'fixtures/customer'
-require 'fixtures/order'
-require 'fixtures/categorization'
-require 'fixtures/category'
-require 'fixtures/post'
-require 'fixtures/author'
-require 'fixtures/comment'
-require 'fixtures/tag'
-require 'fixtures/tagging'
-require 'fixtures/person'
-require 'fixtures/reader'
+require 'models/developer'
+require 'models/project'
+require 'models/company'
+require 'models/topic'
+require 'models/reply'
+require 'models/computer'
+require 'models/customer'
+require 'models/order'
+require 'models/categorization'
+require 'models/category'
+require 'models/post'
+require 'models/author'
+require 'models/comment'
+require 'models/tag'
+require 'models/tagging'
+require 'models/person'
+require 'models/reader'
class AssociationsTest < ActiveSupport::TestCase
fixtures :accounts, :companies, :developers, :projects, :developers_projects,
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'fixtures/topic'
+require 'models/topic'
class AttributeMethodsTest < ActiveSupport::TestCase
fixtures :topics
@@ -1,18 +1,18 @@
require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/company'
-require 'fixtures/customer'
-require 'fixtures/developer'
-require 'fixtures/project'
-require 'fixtures/default'
-require 'fixtures/auto_id'
-require 'fixtures/column_name'
-require 'fixtures/subscriber'
-require 'fixtures/keyboard'
-require 'fixtures/post'
-require 'fixtures/minimalistic'
-require 'fixtures/warehouse_thing'
+require 'models/topic'
+require 'models/reply'
+require 'models/company'
+require 'models/customer'
+require 'models/developer'
+require 'models/project'
+require 'models/default'
+require 'models/auto_id'
+require 'models/column_name'
+require 'models/subscriber'
+require 'models/keyboard'
+require 'models/post'
+require 'models/minimalistic'
+require 'models/warehouse_thing'
require 'rexml/document'
class Category < ActiveRecord::Base; end
@@ -8,7 +8,7 @@
# BLOB data with DB2 or Firebird, because the length of a statement
# is limited to 32KB.
unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
- require 'fixtures/binary'
+ require 'models/binary'
class BinaryTest < ActiveSupport::TestCase
FIXTURES = %w(flowers.jpg example.log)
@@ -17,7 +17,7 @@ def test_load_save
Binary.delete_all
FIXTURES.each do |filename|
- data = File.read("#{File.dirname(__FILE__)}/fixtures/#{filename}").freeze
+ data = File.read("#{File.dirname(__FILE__)}/../assets/#{filename}").freeze
bin = Binary.new(:data => data)
assert_equal data, bin.data, 'Newly assigned data differs from original'
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/topic'
+require 'models/company'
+require 'models/topic'
Company.has_many :accounts
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'fixtures/topic'
+require 'models/topic'
class TestColumnAlias < ActiveSupport::TestCase
fixtures :topics
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class FirebirdConnectionTest < ActiveSupport::TestCase
def test_charset_properly_set
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class MysqlConnectionTest < ActiveSupport::TestCase
def setup
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/task'
+require 'models/topic'
+require 'models/task'
class DateTimeTest < ActiveSupport::TestCase
def test_saves_both_date_and_time
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'fixtures/default'
+require 'models/default'
class DefaultTest < ActiveSupport::TestCase
def test_default_timestamp
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'fixtures/default'
-require 'fixtures/entrant'
+require 'models/default'
+require 'models/entrant'
class DefaultTest < ActiveSupport::TestCase
def test_nil_defaults_for_not_null_columns
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'fixtures/entrant'
+require 'models/entrant'
class DeprecatedFinderTest < ActiveSupport::TestCase
fixtures :entrants
@@ -1,12 +1,12 @@
require 'abstract_unit'
-require 'fixtures/author'
-require 'fixtures/comment'
-require 'fixtures/company'
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/entrant'
-require 'fixtures/developer'
-require 'fixtures/post'
+require 'models/author'
+require 'models/comment'
+require 'models/company'
+require 'models/topic'
+require 'models/reply'
+require 'models/entrant'
+require 'models/developer'
+require 'models/post'
class FinderTest < ActiveSupport::TestCase
fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors
@@ -1,20 +1,20 @@
require 'abstract_unit'
-require 'fixtures/post'
-require 'fixtures/binary'
-require 'fixtures/topic'
-require 'fixtures/computer'
-require 'fixtures/developer'
-require 'fixtures/company'
-require 'fixtures/task'
-require 'fixtures/reply'
-require 'fixtures/joke'
-require 'fixtures/course'
-require 'fixtures/category'
-require 'fixtures/parrot'
-require 'fixtures/pirate'
-require 'fixtures/treasure'
-require 'fixtures/matey'
-require 'fixtures/ship'
+require 'models/post'
+require 'models/binary'
+require 'models/topic'
+require 'models/computer'
+require 'models/developer'
+require 'models/company'
+require 'models/task'
+require 'models/reply'
+require 'models/joke'
+require 'models/course'
+require 'models/category'
+require 'models/parrot'
+require 'models/pirate'
+require 'models/treasure'
+require 'models/matey'
+require 'models/ship'
class FixturesTest < ActiveSupport::TestCase
self.use_instantiated_fixtures = true
@@ -27,7 +27,7 @@ class FixturesTest < ActiveSupport::TestCase
movies projects subscribers topics tasks )
MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/
- BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures/flowers.jpg'
+ BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/../assets/flowers.jpg'
def test_clean_fixtures
FIXTURES.each do |name|
@@ -140,26 +140,26 @@ def test_erb_in_fixtures
end
def test_empty_yaml_fixture
- assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/yml/accounts")
+ assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/yml/accounts")
end
def test_empty_yaml_fixture_with_a_comment_in_it
- assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/fixtures/naked/yml/companies")
+ assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/../fixtures/naked/yml/companies")
end
def test_dirty_dirty_yaml_file
assert_raises(Fixture::FormatError) do
- Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/fixtures/naked/yml/courses")
+ Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/../fixtures/naked/yml/courses")
end
end
def test_empty_csv_fixtures
- assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/csv/accounts")
+ assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/csv/accounts")
end
def test_omap_fixtures
assert_nothing_raised do
- fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/fixtures/categories_ordered')
+ fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/../fixtures/categories_ordered')
i = 0
fixtures.each do |name, fixture|
@@ -430,7 +430,7 @@ def load_fixtures
end
class LoadAllFixturesTest < ActiveSupport::TestCase
- self.fixture_path= File.join(File.dirname(__FILE__), '/fixtures/all')
+ self.fixture_path= File.join(File.dirname(__FILE__), '/../fixtures/all')
fixtures :all
def test_all_there
@@ -1,7 +1,7 @@
require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/project'
-require 'fixtures/subscriber'
+require 'models/company'
+require 'models/project'
+require 'models/subscriber'
class InheritanceTest < ActiveSupport::TestCase
fixtures :companies, :projects, :subscribers, :accounts
@@ -1,10 +1,10 @@
require 'abstract_unit'
-require 'fixtures/contact'
-require 'fixtures/post'
-require 'fixtures/author'
-require 'fixtures/tagging'
-require 'fixtures/tag'
-require 'fixtures/comment'
+require 'models/contact'
+require 'models/post'
+require 'models/author'
+require 'models/tagging'
+require 'models/tag'
+require 'models/comment'
class JsonSerializationTest < ActiveSupport::TestCase
def setup
@@ -1,7 +1,7 @@
require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/developer'
-require 'fixtures/reply'
+require 'models/topic'
+require 'models/developer'
+require 'models/reply'
class Topic; def after_find() end end
class Developer; def after_find() end end
Oops, something went wrong.

0 comments on commit 1e70928

Please sign in to comment.