Merge branch 'jprovazn-testfix2' into 'master'
Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
This commit is contained in:
commit
eea671a2a6
1 changed files with 5 additions and 5 deletions
|
@ -10,14 +10,14 @@ describe Gitlab::Email::Handler::CreateMergeRequestHandler do
|
||||||
stub_config_setting(host: 'localhost')
|
stub_config_setting(host: 'localhost')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
after do
|
||||||
|
TestEnv.clean_test_path
|
||||||
|
end
|
||||||
|
|
||||||
let(:email_raw) { fixture_file('emails/valid_new_merge_request.eml') }
|
let(:email_raw) { fixture_file('emails/valid_new_merge_request.eml') }
|
||||||
let(:namespace) { create(:namespace, path: 'gitlabhq') }
|
let(:namespace) { create(:namespace, path: 'gitlabhq') }
|
||||||
|
|
||||||
# project's git repository is not deleted when project is deleted
|
let!(:project) { create(:project, :public, :repository, namespace: namespace, path: 'gitlabhq') }
|
||||||
# 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!(:user) do
|
let!(:user) do
|
||||||
create(
|
create(
|
||||||
:user,
|
:user,
|
||||||
|
|
Loading…
Reference in a new issue