Merge branch 'cs-really-fix-spinach'
This commit is contained in:
commit
d64a9fb079
|
@ -99,7 +99,7 @@ update-knapsack:
|
|||
- export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
|
||||
- export KNAPSACK_GENERATE_REPORT=true
|
||||
- cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
|
||||
- knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
|
||||
- knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
|
||||
artifacts:
|
||||
expire_in: 31d
|
||||
paths:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'database_cleaner'
|
||||
|
||||
DatabaseCleaner.strategy = :truncation
|
||||
DatabaseCleaner[:active_record].strategy = :truncation
|
||||
|
||||
Spinach.hooks.before_scenario do
|
||||
DatabaseCleaner.start
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
# 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
|
||||
require 'spinach-rerun-reporter'
|
||||
|
||||
module Spinach
|
||||
class Reporter
|
||||
class Rerun
|
||||
|
|
Loading…
Reference in New Issue