diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-14 16:13:18 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-14 16:13:18 +0200 |
commit | d64a9fb079de92e90cf8c0665ce85ee3251f3443 (patch) | |
tree | 674d865a6446f74b6ccd0a56a3423910ab8403c6 | |
parent | 48d223d7c944b99d6aca960a9e10ffe6e7f7cb78 (diff) | |
parent | eaa22eb447b8dcd690f084221db26043274f343b (diff) | |
download | gitlab-ce-d64a9fb079de92e90cf8c0665ce85ee3251f3443.tar.gz |
Merge branch 'cs-really-fix-spinach'
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | features/support/db_cleaner.rb | 2 | ||||
-rw-r--r-- | features/support/rerun.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3b864f16cf..ace0de5cad3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/features/support/db_cleaner.rb b/features/support/db_cleaner.rb index 1ab308cfa55..8294bb1445f 100644 --- a/features/support/db_cleaner.rb +++ b/features/support/db_cleaner.rb @@ -1,6 +1,6 @@ require 'database_cleaner' -DatabaseCleaner.strategy = :truncation +DatabaseCleaner[:active_record].strategy = :truncation Spinach.hooks.before_scenario do DatabaseCleaner.start diff --git a/features/support/rerun.rb b/features/support/rerun.rb index 8b176c5be89..60b78f9d050 100644 --- a/features/support/rerun.rb +++ b/features/support/rerun.rb @@ -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 |