diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-10-05 18:10:09 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-10-05 18:10:09 -0600 |
| commit | d1145123283b36007301b99441125a125f29a74d (patch) | |
| tree | bc9d9dc6f48fc6201a6b94d11c0e28dd5af96a9f | |
| parent | b4577baf07fc9f221599fd6ae789ea0a0cd6fcbd (diff) | |
| download | gitlab-ce-cs-fix-spinach.tar.gz | |
Let's try this.cs-fix-spinach
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | features/support/db_cleaner.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88468019712..e2eeda169b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,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 || bundle exec spinach artifacts: expire_in: 31d paths: diff --git a/features/support/db_cleaner.rb b/features/support/db_cleaner.rb index af0c33d4e14..1ab308cfa55 100644 --- a/features/support/db_cleaner.rb +++ b/features/support/db_cleaner.rb @@ -1,11 +1,11 @@ require 'database_cleaner' -DatabaseCleaner[:active_record].strategy = :truncation +DatabaseCleaner.strategy = :truncation Spinach.hooks.before_scenario do - DatabaseCleaner[:active_record].start + DatabaseCleaner.start end Spinach.hooks.after_scenario do - DatabaseCleaner[:active_record].clean + DatabaseCleaner.clean end |