Skip to content

Commit 8a37f3b

Browse files
committed
No need to use begin/end blocks
1 parent 03d4ed3 commit 8a37f3b

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

activerecord/test/cases/adapters/mysql/active_schema_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ def test_remove_timestamps
118118
end
119119

120120
def test_indexes_in_create
121-
begin
122-
ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false)
123-
ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false)
124-
expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query"
125-
actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t|
126-
t.index :zip
127-
end
128-
assert_equal expected, actual
121+
ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false)
122+
ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false)
123+
124+
expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query"
125+
actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t|
126+
t.index :zip
129127
end
128+
129+
assert_equal expected, actual
130130
end
131131

132132
private

activerecord/test/cases/adapters/mysql2/active_schema_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ def test_remove_timestamps
118118
end
119119

120120
def test_indexes_in_create
121-
begin
122-
ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false)
123-
ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false)
124-
expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query"
125-
actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t|
126-
t.index :zip
127-
end
128-
assert_equal expected, actual
121+
ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false)
122+
ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false)
123+
124+
expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query"
125+
actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t|
126+
t.index :zip
129127
end
128+
129+
assert_equal expected, actual
130130
end
131131

132132
private

0 commit comments

Comments
 (0)