Merge pull request rails#1945 from spohlenz/fix-engine-migrations-check

Fix has_migrations? check in Rails::Engine
spikex · Jul 3, 2011 · a1d85a0 · a1d85a0
2 parents 3875e44 + a7a58af
commit a1d85a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
@@ -586,7 +586,7 @@ def routes?
     end
 
     def has_migrations?
-      paths["db/migrate"].first.present?
+      paths["db/migrate"].existent.any?
     end
 
     def find_root_with_flag(flag, default=nil)

diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
@@ -84,6 +84,15 @@ class CreateYaffles < ActiveRecord::Migration
       end
     end
 
+    def test_no_rake_task_without_migrations
+      boot_rails
+      require 'rake'
+      require 'rdoc/task'
+      require 'rake/testtask'
+      Rails.application.load_tasks
+      assert !Rake::Task.task_defined?('bukkits:install:migrations')
+    end
+
     def test_puts_its_lib_directory_on_load_path
       boot_rails
       require "another"