diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-26 20:30:28 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-26 20:30:28 -0300 |
| commit | 8a37f3b59cb1399f71f02d9684fd9defcbd97697 (patch) | |
| tree | 3aab5c9b59052c668c83fef0c7158de747836e1e /activerecord | |
| parent | 03d4ed3827da2086a8c8dadf4c25666248a39c0d (diff) | |
| download | rails-8a37f3b59cb1399f71f02d9684fd9defcbd97697.tar.gz rails-8a37f3b59cb1399f71f02d9684fd9defcbd97697.tar.bz2 rails-8a37f3b59cb1399f71f02d9684fd9defcbd97697.zip | |
No need to use begin/end blocks
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql/active_schema_test.rb | 16 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/active_schema_test.rb | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb index b27bd652f2..d1c644c016 100644 --- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb +++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb @@ -118,15 +118,15 @@ class ActiveSchemaTest < ActiveRecord::TestCase end def test_indexes_in_create - begin - ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false) - ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false) - expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query" - actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t| - t.index :zip - end - assert_equal expected, actual + ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false) + ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false) + + expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query" + actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t| + t.index :zip end + + assert_equal expected, actual end private diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb index c15ecddd69..81c614924f 100644 --- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb @@ -118,15 +118,15 @@ class ActiveSchemaTest < ActiveRecord::TestCase end def test_indexes_in_create - begin - ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false) - ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false) - expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query" - actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t| - t.index :zip - end - assert_equal expected, actual + ActiveRecord::Base.connection.stubs(:table_exists?).with(:temp).returns(false) + ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false) + + expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`) ) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query" + actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t| + t.index :zip end + + assert_equal expected, actual end private |