Merge pull request maxdemarzi#63 from kfreytag/master

Restoring spec task and adding ci_spec.
willkessler · Nov 15, 2013 · 958db1b · 958db1b
2 parents 470dfc5 + 84fb2fe
commit 958db1b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
+.idea
 .rvmrc
 .DS_Store
 deja_test.rb
 test.rb
 neo4j
+Gemfile.server.lock
diff --git a/Gemfile.server.lock b/Gemfile.server.lock
diff --git a/Rakefile b/Rakefile
@@ -12,8 +12,15 @@ Bundler::GemHelper.install_tasks
 
 $: << File.expand_path("#{File.dirname(__FILE__)}/lib")
 
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color --format documentation"
+  t.pattern = "spec/**/*_spec.rb"
+end
 
-desc "Run Tests"
-task :spec => 'ci:setup:rspec'
+desc 'Run Tests'
 task :default => :spec
+
+RSpec::Core::RakeTask.new('ci_spec')
+
+desc 'Run Koality Tests'
+task :ci_spec => 'ci:setup:rspec'
diff --git a/koality.yml b/koality.yml
@@ -11,6 +11,6 @@ test:
   machines: 1
   scripts:
   - tests:
-      script: BUNDLE_GEMFILE=Gemfile.server rake
+      script: BUNDLE_GEMFILE=Gemfile.server rake ci_spec
       timeout: 1800
       xunit: spec/reports