Download as
Browse Code »

Commit 08d5b3dba2a0cb7cb1595f03e4e0fffff308f16d

Authored by Antonio Terceiro
1 parent ec09b0fb
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Run cucumber with `--format progress` by default

Showing 3 changed files with 3 additions and 4 deletions   Show diff stats
lib/tasks/cucumber.rake
  Diff comments   View file @08d5b3d
@@ -14,13 +14,13 @@ begin @@ -14,13 +14,13 @@ begin
14 Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| 14 Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
15 t.binary = vendored_cucumber_binary 15 t.binary = vendored_cucumber_binary
16 t.fork = true # You may get faster startup if you set this to false 16 t.fork = true # You may get faster startup if you set this to false
17 - t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" 17 + t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
18 end 18 end
19 19
20 Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t| 20 Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
21 t.binary = vendored_cucumber_binary 21 t.binary = vendored_cucumber_binary
22 t.fork = true # You may get faster startup if you set this to false 22 t.fork = true # You may get faster startup if you set this to false
23 - t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" 23 + t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
24 end 24 end
25 25
26 desc 'Run all features' 26 desc 'Run all features'
lib/tasks/test.rake
  Diff comments   View file @08d5b3d
@@ -2,5 +2,5 @@ task :default => [:test, :cucumber, :selenium] @@ -2,5 +2,5 @@ task :default => [:test, :cucumber, :selenium]
2 2
3 desc 'Runs Seleniun acceptance tests' 3 desc 'Runs Seleniun acceptance tests'
4 task :selenium do 4 task :selenium do
5 - sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" 5 + sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
6 end 6 end
script/ci-build
  Diff comments   View file @08d5b3d
1 #!/bin/sh 1 #!/bin/sh
2 2
3 -export CUCUMBER_FORMAT=progress  
4 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake 3 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake