summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-11 09:47:12 -0700
committerjessib <jessib@riseup.net>2012-10-11 09:47:12 -0700
commit336d5f786bbd1aaf1847007db64e55f96e585b9d (patch)
tree0a18244ba8d21ed821c52edb2d44544b5358aa26 /lib
parentcf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff)
parent09003d3d2df7c250d3a0b55e83094e5e27094859 (diff)
Merge branch 'develop' into help_develop
Conflicts: .gitignore
Diffstat (limited to 'lib')
-rw-r--r--lib/leap_web/version.rb2
-rw-r--r--lib/tasks/gems.rake2
-rw-r--r--lib/tasks/task_helper.rb2
-rw-r--r--lib/tasks/test.rake18
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