summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-12-08 06:30:21 +0000
committerStan Hu <stanhu@gmail.com>2017-12-08 06:30:21 +0000
commiteea671a2a6c0b953922c8f8535c09c16cd00e79f (patch)
treeff37401e37a1d6fbb9e60b703172f5862a891ba4
parenta19d79e8c4aba1e1b79e731b74fb6c26d31abd05 (diff)
parentb2e0f609b4571d616aa8b66003022d2f97b35f06 (diff)
downloadgitlab-ce-eea671a2a6c0b953922c8f8535c09c16cd00e79f.tar.gz
Merge branch 'jprovazn-testfix2' into 'master'
Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
-rw-r--r--spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
index e361d1a7393..51ce3116880 100644
--- a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
@@ -10,14 +10,14 @@ describe Gitlab::Email::Handler::CreateMergeRequestHandler do
stub_config_setting(host: 'localhost')
end
+ after do
+ TestEnv.clean_test_path
+ end
+
let(:email_raw) { fixture_file('emails/valid_new_merge_request.eml') }
let(:namespace) { create(:namespace, path: 'gitlabhq') }
- # project's git repository is not deleted when project is deleted
- # between tests. Then tests fail because re-creation of the project with
- # the same name fails on existing git repository -> skip_disk_validation
- # ignores repository existence on disk
- let!(:project) { create(:project, :public, :repository, skip_disk_validation: true, namespace: namespace, path: 'gitlabhq') }
+ let!(:project) { create(:project, :public, :repository, namespace: namespace, path: 'gitlabhq') }
let!(:user) do
create(
:user,