Skip to content

Commit 87e70a2

Browse files
authored
Merge pull request rails#51585 from Shopify/create-fixtures-block
TestCase#create_fixtures no longer takes a block
2 parents b272be8 + 65cb5f8 commit 87e70a2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

activerecord/test/cases/fixtures_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def test_multiple_clean_fixtures
374374
end
375375

376376
def test_create_symbol_fixtures
377-
fixtures = ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, :collections, collections: Course) { Course.connection }
377+
fixtures = ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, :collections, collections: Course)
378378

379379
assert Course.find_by_name("Collection"), "course is not in the database"
380380
assert fixtures.detect { |f| f.name == "collections" }, "no fixtures named 'collections' in #{fixtures.map(&:name).inspect}"

activerecord/test/cases/multiple_db_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class MultipleDbTest < ActiveRecord::TestCase
99
self.use_transactional_tests = false
1010

1111
def setup
12-
@courses = create_fixtures("courses") { Course.retrieve_connection }
13-
@colleges = create_fixtures("colleges") { College.retrieve_connection }
12+
@courses = create_fixtures("courses")
13+
@colleges = create_fixtures("colleges")
1414
@entrants = create_fixtures("entrants")
1515
end
1616

activerecord/test/cases/test_case.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def check_connection_leaks
8383
end
8484
end
8585

86-
def create_fixtures(*fixture_set_names, &block)
87-
ActiveRecord::FixtureSet.create_fixtures(ActiveRecord::TestCase.fixture_paths, fixture_set_names, fixture_class_names, &block)
86+
def create_fixtures(*fixture_set_names)
87+
ActiveRecord::FixtureSet.create_fixtures(ActiveRecord::TestCase.fixture_paths, fixture_set_names, fixture_class_names)
8888
end
8989

9090
def capture_sql(include_schema: false)

0 commit comments

Comments
 (0)