diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-09-26 12:43:42 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-09-26 12:43:42 +0000 |
| commit | cfd2c31bfe01d9dabc68c56dcd1cb1ddb53eb5bc (patch) | |
| tree | 2003f864d8e58a707bb835557483cc5f13c0b24d | |
| parent | 6c3c76af0d81e472a35697860a90de84b612b0fc (diff) | |
| parent | b720ea0613c1ce8db48f300a6d685f74acb9b9bf (diff) | |
| download | gitlab-ce-cfd2c31bfe01d9dabc68c56dcd1cb1ddb53eb5bc.tar.gz | |
Merge branch 'mk/backport-fix-safe-request-store-test' into 'master'
[CE backport] Fix RequestStore-related EE-only test failure
See merge request gitlab-org/gitlab-ce!21915
| -rw-r--r-- | spec/lib/gitlab/safe_request_store_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/safe_request_store_spec.rb b/spec/lib/gitlab/safe_request_store_spec.rb index 27766fa0eda..c797171dbe2 100644 --- a/spec/lib/gitlab/safe_request_store_spec.rb +++ b/spec/lib/gitlab/safe_request_store_spec.rb @@ -219,11 +219,11 @@ describe Gitlab::SafeRequestStore do end context 'when RequestStore is NOT active' do - around do |example| + before do RequestStore.write('foo', true) + end - example.run - + after do RequestStore.clear! # Clean up end |