Commit 1bd23c42 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-dequarantine-file-locking-spec' into 'master'

Dequarantine file_locking_spec test

See merge request gitlab-org/gitlab!68427
parents 8048ccf1 661b8faa
...@@ -63,7 +63,7 @@ module QA ...@@ -63,7 +63,7 @@ module QA
end end
end end
it 'creates a merge request and fails to merge', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/issues/40125', type: :bug }, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1852' do it 'creates a merge request and fails to merge', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1852' do
push branch: 'test', as_user: user_one push branch: 'test', as_user: user_one
merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request| merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment