diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake index c537159..36b0228 100644 --- a/lib/tasks/cucumber.rake +++ b/lib/tasks/cucumber.rake @@ -14,13 +14,13 @@ begin Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| t.binary = vendored_cucumber_binary t.fork = true # You may get faster startup if you set this to false - t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" + t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}" end Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t| t.binary = vendored_cucumber_binary t.fork = true # You may get faster startup if you set this to false - t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" + t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}" end desc 'Run all features' diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index 8ee9730..4d67e0c 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -2,5 +2,5 @@ task :default => [:test, :cucumber, :selenium] desc 'Runs Seleniun acceptance tests' task :selenium do - sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" + sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}" end diff --git a/script/ci-build b/script/ci-build index 90fe5b6..af2844d 100755 --- a/script/ci-build +++ b/script/ci-build @@ -1,4 +1,3 @@ #!/bin/sh -export CUCUMBER_FORMAT=progress cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake -- libgit2 0.21.2