Clean test path between merge request handler tests

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

Clean test path between merge request handler tests
b2e0f609 · Jan Provaznik · 29e39e55 · b2e0f609
Commit b2e0f609 authored Dec 07, 2017 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

create_merge_request_handler_spec.rb ...gitlab/email/handler/create_merge_request_handler_spec.rb +5 -5

No files found.
--- 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,