Commit af434016 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Retry spinach tests

parent 640bf8ab
...@@ -265,6 +265,7 @@ group :development, :test do ...@@ -265,6 +265,7 @@ group :development, :test do
gem 'rspec-rails', '~> 3.3.0' gem 'rspec-rails', '~> 3.3.0'
gem 'rspec-retry' gem 'rspec-retry'
gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rails', '~> 0.2.1'
gem 'spinach-rerun-reporter', '~> 0.0.2'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0' gem 'minitest', '~> 5.7.0'
......
...@@ -766,6 +766,8 @@ GEM ...@@ -766,6 +766,8 @@ GEM
capybara (>= 2.0.0) capybara (>= 2.0.0)
railties (>= 3) railties (>= 3)
spinach (>= 0.4) spinach (>= 0.4)
spinach-rerun-reporter (0.0.2)
spinach (~> 0.8)
spring (1.6.4) spring (1.6.4)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
...@@ -1020,6 +1022,7 @@ DEPENDENCIES ...@@ -1020,6 +1022,7 @@ DEPENDENCIES
six (~> 0.2.0) six (~> 0.2.0)
slack-notifier (~> 1.2.0) slack-notifier (~> 1.2.0)
spinach-rails (~> 0.2.1) spinach-rails (~> 0.2.1)
spinach-rerun-reporter (~> 0.0.2)
spring (~> 1.6.4) spring (~> 1.6.4)
spring-commands-rspec (~> 1.0.4) spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.0.0) spring-commands-spinach (~> 1.0.0)
......
...@@ -14,6 +14,7 @@ require 'sidekiq/testing/inline' ...@@ -14,6 +14,7 @@ require 'sidekiq/testing/inline'
require_relative 'capybara' require_relative 'capybara'
require_relative 'db_cleaner' require_relative 'db_cleaner'
require_relative 'rerun'
%w(select2_helper test_env repo_helpers).each do |f| %w(select2_helper test_env repo_helpers).each do |f|
require Rails.root.join('spec', 'support', f) require Rails.root.join('spec', 'support', f)
......
# The spinach-rerun-reporter doesn't define the on_undefined_step
# See it here: https://github.com/javierav/spinach-rerun-reporter/blob/master/lib/spinach/reporter/rerun.rb
module Spinach
class Reporter
class Rerun
def on_undefined_step(step_data, failure, step_definitions = nil)
super step_data, failure, step_definitions
# save feature file and scenario line
@rerun << "#{current_feature.filename}:#{current_scenario.line}"
end
end
end
end
...@@ -4,53 +4,59 @@ namespace :spinach do ...@@ -4,53 +4,59 @@ namespace :spinach do
namespace :project do namespace :project do
desc "GitLab | Spinach | Run project commits, issues and merge requests spinach features" desc "GitLab | Spinach | Run project commits, issues and merge requests spinach features"
task :half do task :half do
cmds = [ run_spinach_tests('@project_commits,@project_issues,@project_merge_requests')
%W(rake gitlab:setup),
%W(spinach --tags @project_commits,@project_issues,@project_merge_requests),
]
run_commands(cmds)
end end
desc "GitLab | Spinach | Run remaining project spinach features" desc "GitLab | Spinach | Run remaining project spinach features"
task :rest do task :rest do
cmds = [ run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests')
%W(rake gitlab:setup),
%W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests),
]
run_commands(cmds)
end end
end end
desc "GitLab | Spinach | Run project spinach features" desc "GitLab | Spinach | Run project spinach features"
task :project do task :project do
cmds = [ run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets')
%W(rake gitlab:setup),
%W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
]
run_commands(cmds)
end end
desc "GitLab | Spinach | Run other spinach features" desc "GitLab | Spinach | Run other spinach features"
task :other do task :other do
cmds = [ run_spinach_tests('@admin,@dashboard,@profile,@public,@snippets')
%W(rake gitlab:setup), end
%W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
] desc "GitLab | Spinach | Run other spinach features"
run_commands(cmds) task :builds do
run_spinach_tests('@builds')
end end
end end
desc "GitLab | Run spinach" desc "GitLab | Run spinach"
task :spinach do task :spinach do
cmds = [ run_spinach_tests(nil)
%W(rake gitlab:setup), end
%W(spinach),
] def run_command(cmd)
run_commands(cmds) system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
end end
def run_commands(cmds) def run_spinach_command(args)
cmds.each do |cmd| run_command(%w(spinach -r rerun) + args)
system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!") end
def run_spinach_tests(tags)
#run_command(%w(rake gitlab:setup)) or raise('gitlab:setup failed!')
success = run_spinach_command(%W(--tags #{tags}))
3.times do |_|
break if success
break unless File.exists?('tmp/spinach-rerun.txt')
tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
puts ''
puts "Spinach tests for #{tags}: Retrying tests... #{tests}".red
puts ''
sleep(3)
success = run_spinach_command(tests)
end end
raise("spinach tests for #{tags} failed!") unless success
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment