Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

4 files changed, 21 insertions, 3 deletions

diff --git a/lib/leap_web/version.rb b/lib/leap_web/version.rb
index bac8655..6a74082 100644
--- a/lib/leap_web/version.rb
+++ b/lib/leap_web/version.rb
@@ -1,3 +1,3 @@
 module LeapWeb
-  VERSION = "0.1.0"
+  VERSION = "0.1.0" unless defined?(LeapWeb::VERSION)
 end
diff --git a/lib/tasks/gems.rake b/lib/tasks/gems.rake
index 27eb04c..8120235 100644
--- a/lib/tasks/gems.rake
+++ b/lib/tasks/gems.rake
@@ -12,7 +12,7 @@ namespace :gem do
     putsys "bundle exec rake gem"
   end
   
-  desc "run rake gem for all gems"
+  desc "clear pkg directory for all gems"
   task :clear do
     each_gem do |gem_name|
       putsys "rm -rf #{gem_name}/pkg"
diff --git a/lib/tasks/task_helper.rb b/lib/tasks/task_helper.rb
index aa37698..26e60bc 100644
--- a/lib/tasks/task_helper.rb
+++ b/lib/tasks/task_helper.rb
@@ -2,7 +2,7 @@ require File.expand_path('../../../lib/leap_web/version', __FILE__)
 
 module TaskHelper
 
-  ENGINES = %w(core users certs help)
+  ENGINES = %w(users certs help)
 
   def putsys(cmd)
     puts cmd
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
new file mode 100644
index 0000000..3c87b45
--- /dev/null
+++ b/lib/tasks/test.rake
@@ -0,0 +1,18 @@
+namespace :test do
+
+  Rails::SubTestTask.new(:units => "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = '*/test/unit/**/*_test.rb'
+  end
+
+  Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = '*/test/functional/**/*_test.rb'
+  end
+
+  Rails::SubTestTask.new(:integration => "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = '*/test/integration/**/*_test.rb'
+  end
+
+end