diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2017-12-07 16:41:42 +0100 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2017-12-07 20:20:41 +0100 |
commit | b2e0f609b4571d616aa8b66003022d2f97b35f06 (patch) | |
tree | 100de40341a2b46dc3ae11f5a9f9039100c283d6 | |
parent | 29e39e55c3d4b5c6c34c6faec84b0dcd5a3efffa (diff) | |
download | gitlab-ce-b2e0f609b4571d616aa8b66003022d2f97b35f06.tar.gz |
Clean test path between merge request handler testsjprovazn-testfix2
create_merge_request_handler_spec needs a repository for some tests but
this repository lasts on disk by default which causes failures of other
tests. TestEnv.clean_test_path is used to get rid of the repository
after each test.
Closes #40900
-rw-r--r-- | spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb | 10 |
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, |