diff options
author | José Valim <jose.valim@gmail.com> | 2011-06-10 04:43:43 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-06-10 04:43:43 -0700 |
commit | 78acd17f3124a22485aa1bdcc64d7d1e6e69cb2d (patch) | |
tree | e482cdcc4571033adcf73285dcf997c0fcdf135b /railties/test | |
parent | 0bcbcdfdad1e082ba7740a5d60c61eb3349b670a (diff) | |
parent | 25ad43015c3fc7694a4e6869e1d457b96160da28 (diff) | |
download | rails-78acd17f3124a22485aa1bdcc64d7d1e6e69cb2d.tar.gz rails-78acd17f3124a22485aa1bdcc64d7d1e6e69cb2d.tar.bz2 rails-78acd17f3124a22485aa1bdcc64d7d1e6e69cb2d.zip |
Merge pull request #1567 from BDQ/engine_migrations
Ensure engine migrations are copied in correct sequence
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/railties/shared_tests.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb index d8ea58166e..8cbc76db71 100644 --- a/railties/test/railties/shared_tests.rb +++ b/railties/test/railties/shared_tests.rb @@ -53,6 +53,9 @@ module RailtiesTest add_to_config "ActiveRecord::Base.timestamped_migrations = false" + boot_rails + railties = Rails.application.railties.all.map(&:railtie_name) + Dir.chdir(app_path) do output = `bundle exec rake bukkits:install:migrations` @@ -63,12 +66,16 @@ module RailtiesTest assert_match /NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/, output assert_equal 3, Dir["#{app_path}/db/migrate/*.rb"].length - output = `bundle exec rake railties:install:migrations` + output = `bundle exec rake railties:install:migrations`.split("\n") assert File.exists?("#{app_path}/db/migrate/4_create_yaffles.rb") - assert_match /NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/, output - assert_match /Copied migration 4_create_yaffles.rb from acts_as_yaffle/, output - assert_no_match /2_create_users/, output + assert_no_match /2_create_users/, output.join("\n") + + yaffle_migration_order = output.index(output.detect{|o| /Copied migration 4_create_yaffles.rb from acts_as_yaffle/ =~ o }) + bukkits_migration_order = output.index(output.detect{|o| /NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/ =~ o }) + assert_not_nil yaffle_migration_order, "Expected migration to be copied" + assert_not_nil bukkits_migration_order, "Expected migration to be skipped" + assert_equal (railties.index('acts_as_yaffle') > railties.index('bukkits')) , (yaffle_migration_order > bukkits_migration_order) migrations_count = Dir["#{app_path}/db/migrate/*.rb"].length output = `bundle exec rake railties:install:migrations` |