Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added the possibility of specifying fixtures in multiple calls #816 […

…kim@tinker.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 060b9b16aa4104858c13e4fd467b05c8e4fda127 1 parent 78a732b
@dhh dhh authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added the possibility of specifying fixtures in multiple calls #816 [kim@tinker.com]
+
* Added Base.exists?(id) that'll return true if an object of the class with the given id exists #854 [stian@grytoyr.net]
* Added optionally allow for nil or empty strings with validates_numericality_of #801 [Sebastian Kanthak]
View
2  activerecord/lib/active_record/fixtures.rb
@@ -367,7 +367,7 @@ class TestCase #:nodoc:
self.use_instantiated_fixtures = true
def self.fixtures(*table_names)
- self.fixture_table_names = table_names.flatten
+ self.fixture_table_names |= table_names.flatten
require_fixture_classes
end
View
20 activerecord/test/fixtures_test.rb
@@ -136,3 +136,23 @@ def test_destroy_just_kidding
assert_not_nil @first
end
end
+
+
+class MultipleFixturesTest < Test::Unit::TestCase
+ fixtures :topics
+ fixtures :developers, :accounts
+
+ def test_fixture_table_names
+ assert_equal([:topics, :developers, :accounts], fixture_table_names)
+ end
+end
+
+
+class OverlappingFixturesTest < Test::Unit::TestCase
+ fixtures :topics, :developers
+ fixtures :developers, :accounts
+
+ def test_fixture_table_names
+ assert_equal([:topics, :developers, :accounts], fixture_table_names)
+ end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.