From cfc1bdbb4587b837e2f03a67bce7fae216982742 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 8 Jan 2019 09:17:18 +0100 Subject: [PATCH] Refactoring: NO_RESET_BEFORE_SUITE is not practical for the general use case of running RSpec multiple times and slows down/decreases DX. --- .gitlab-ci.yml | 2 -- spec/support/reset_system_before_suite.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b54d0f2f3..510c28235 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -366,14 +366,12 @@ browser:build: <<: *test_capybara_definition variables: RAILS_ENV: "test" - NO_RESET_BEFORE_SUITE: "true" BROWSER: "chrome" .variables_capybara_ff_template: &variables_capybara_ff_definition <<: *test_capybara_definition variables: RAILS_ENV: "test" - NO_RESET_BEFORE_SUITE: "true" BROWSER: "firefox" test:browser:core:capybara_chrome_postgresql: diff --git a/spec/support/reset_system_before_suite.rb b/spec/support/reset_system_before_suite.rb index 15636f579..da435cb4c 100644 --- a/spec/support/reset_system_before_suite.rb +++ b/spec/support/reset_system_before_suite.rb @@ -1,6 +1,6 @@ RSpec.configure do |config| config.before(:suite) do - next if ENV['NO_RESET_BEFORE_SUITE'] + next if !ENV['RESET_BEFORE_SUITE'] Rake::Task['zammad:db:reset'].invoke end