Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

2 files changed, 11 insertions, 6 deletions

diff --git a/lib/tasks/i18n.rake b/lib/tasks/i18n.rake
index 6ffbb23..1034211 100644
--- a/lib/tasks/i18n.rake
+++ b/lib/tasks/i18n.rake
@@ -63,7 +63,7 @@ namespace :i18n do
   desc "pull translations from transifex"
   task :download do
     Dir.chdir('config/') do
-      if !File.exists?('transifex.netrc')
+      if !File.exist?('transifex.netrc')
         puts "In order to download translations, you need a config/transifex.netrc file."
         puts "For example:"
         puts "machine www.transifex.com login yourusername password yourpassword"
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index d96b625..9859729 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,10 +1,15 @@
 namespace :test do
 
-  [:units, :functionals, :integration].each do |type|
-    Rails::SubTestTask.new(type => "test:prepare") do |t|
-      t.libs << "test"
-      subdir = type.to_s.singularize
-      t.pattern = "engines/*/test/#{subdir}/**/*_test.rb"
+  namespace :engines do
+    [:units, :functionals, :integration].each do |type|
+      desc "Test engine #{type}"
+      Rails::TestTask.new(type => "test:prepare") do |t|
+        t.libs << "test"
+        subdir = type.to_s.singularize
+        t.pattern = "engines/*/test/#{subdir}/**/*_test.rb"
+      end
+      Rake::Task["test:#{type}"].enhance ["test:engines:#{type}"]
+      Rake::Task["test"].enhance ["test:engines:#{type}"]
     end
   end