Merge pull request #3626 from basiszwo/rerun-tests

Rerun specs and cukes on CI failures (if defined)

config/cucumber.yml

@@ -27,10 +27,11 @@
 #++
 
 <%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --tags ~@wip"
+rerun_file  = "tmp/cucumber-rerun.txt"
+rerun       = File.file?(rerun_file) ? IO.read(rerun_file) : ""
+rerun_opts  = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts    = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --tags ~@wip"
 %>
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --tags ~@wip
+rerun: <%= rerun_opts %> --format rerun --out <%= rerun_file %> --tags ~@wip

spec/features/work_packages/details/inplace_editor/description_editor_spec.rb

@@ -4,7 +4,7 @@ require 'features/work_packages/shared_contexts'
 require 'features/work_packages/details/inplace_editor/work_package_field'
 require 'features/work_packages/work_packages_page'
 
-describe 'description inplace editor', js: true, retry: 3, retry_wait: 5 do
+describe 'description inplace editor', js: true do
   include_context 'maximized window'
 
   let(:project) { FactoryGirl.create :project_with_types, is_public: true }

spec/features/work_packages/details/inplace_editor/subject_editor_spec.rb

@@ -4,7 +4,7 @@ require 'features/work_packages/shared_contexts'
 require 'features/work_packages/details/inplace_editor/work_package_field'
 require 'features/work_packages/work_packages_page'
 
-describe 'subject inplace editor', js: true, retry: 3, retry_wait: 5 do
+describe 'subject inplace editor', js: true do
   include_context 'maximized window'
 
   let(:project) { FactoryGirl.create :project_with_types, is_public: true }

spec/features/work_packages/navigation_spec.rb

@@ -38,7 +38,7 @@ RSpec.feature 'Work package navigation' do
     login_as(user)
   end
 
-  scenario 'all different angular based work package views', js: true, retry: 3, retry_wait: 5 do
+  scenario 'all different angular based work package views', js: true do
     # deep link global work package index
     global_work_packages = Pages::WorkPackagesTable.new
     global_work_packages.visit!

spec/features/work_packages/select_work_package_row_spec.rb

@@ -29,7 +29,7 @@
 require 'spec_helper'
 require 'features/work_packages/work_packages_page'
 
-describe 'Select work package row', type: :feature, retry: 3, retry_wait: 5 do
+describe 'Select work package row', type: :feature do
   let(:user) { FactoryGirl.create(:admin) }
   let(:project) { FactoryGirl.create(:project) }
   let(:work_package_1) { FactoryGirl.create(:work_package, project: project) }

spec/lib/acts_as_watchable/lib/acts_as_watchable/routes_spec.rb

@@ -37,7 +37,7 @@ describe OpenProject::Acts::Watchable::Routes do
     end.new(type, id)
   }
 
-  describe 'matches?', retry: 3, retry_wait: 10 do
+  describe 'matches?' do
     shared_examples_for 'watched model' do
       describe 'for a valid id string' do
         let(:id) { '1' }

spec/models/principal_spec.rb

@@ -28,7 +28,7 @@
 
 require 'spec_helper'
 
-describe Principal, type: :model, retry: 3, retry_wait: 5 do
+describe Principal, type: :model do
   let(:user) { FactoryGirl.build(:user) }
   let(:group) { FactoryGirl.build(:group) }
 

spec/spec_helper.rb

@@ -133,8 +133,11 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    [User, Project, WorkPackage].each do |cls|
-      raise "your specs left a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
+    # We don't want this to be reported on CI as it breaks the build
+    unless ENV['CI']
+      [User, Project, WorkPackage].each do |cls|
+        raise "your specs left a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
+      end
     end
   end
 

spec/support/rspec_retry.rb

@@ -31,6 +31,15 @@ require 'rspec/retry'
 RSpec.configure do |config|
   # show retry status in spec process
   config.verbose_retry = true
+
   # show exception that triggers a retry if verbose_retry is set to true
   config.display_try_failure_messages = true
+
+  # We only want to retry when running on CI servers
+  if ENV['CI']
+    # retry every failure by default
+    config.default_retry_count = 2
+
+    config.default_sleep_interval = 5
+  end
 end