diff options
| author | Arun Agrawal <arunagw@gmail.com> | 2012-04-16 09:44:50 +0530 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2012-04-16 12:10:39 +0530 |
| commit | ba3e27532bea76e1956347dd2ab868f7ff0ec137 (patch) | |
| tree | 2b1c83538c5ec021b09b648802cfdf984bb7e148 /railties | |
| parent | b8f748269584c1475f6e06aec48fce627f603880 (diff) | |
| download | rails-ba3e27532bea76e1956347dd2ab868f7ff0ec137.tar.gz rails-ba3e27532bea76e1956347dd2ab868f7ff0ec137.tar.bz2 rails-ba3e27532bea76e1956347dd2ab868f7ff0ec137.zip | |
fix scaffold_generator_test.rb and model_generator_test.rb
Broken after this 6a054b0038bac288a1f6e45feb5470f4ee492081
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/generators/model_generator_test.rb | 8 | ||||
| -rw-r--r-- | railties/test/generators/scaffold_generator_test.rb | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index e8d933935d..fd3b8c8a17 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -283,7 +283,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase assert_migration "db/migrate/create_accounts.rb" do |m| assert_method :change, m do |up| - assert_match(/add_index/, up) + assert_match(/index: true/, up) end end end @@ -293,7 +293,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase assert_migration "db/migrate/create_accounts.rb" do |m| assert_method :change, m do |up| - assert_match(/add_index/, up) + assert_match(/index: true/, up) end end end @@ -303,7 +303,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase assert_migration "db/migrate/create_accounts.rb" do |m| assert_method :change, m do |up| - assert_no_match(/add_index/, up) + assert_no_match(/index: true/, up) end end end @@ -313,7 +313,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase assert_migration "db/migrate/create_accounts.rb" do |m| assert_method :change, m do |up| - assert_no_match(/add_index/, up) + assert_no_match(/index: true/, up) end end end diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 7123950add..9b456c64ef 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -14,10 +14,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/ assert_file "test/unit/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/ assert_file "test/fixtures/product_lines.yml" - assert_migration "db/migrate/create_product_lines.rb", /belongs_to :product/ - assert_migration "db/migrate/create_product_lines.rb", /add_index :product_lines, :product_id/ - assert_migration "db/migrate/create_product_lines.rb", /references :user/ - assert_migration "db/migrate/create_product_lines.rb", /add_index :product_lines, :user_id/ + assert_migration "db/migrate/create_product_lines.rb", /belongs_to :product, index: true/ + assert_migration "db/migrate/create_product_lines.rb", /references :user, index: true/ # Route assert_file "config/routes.rb" do |route| |