Commit c4218c7f authored by richard.chong's avatar richard.chong

Unquarantines the spec to have it start running in Staging again

parent b0655bf1
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
module QA module QA
RSpec.describe 'Verify' do RSpec.describe 'Verify' do
# Quarantine at top level due to multiple failures, specified in examples describe 'Cancelling merge request in merge train', :runner, :requires_admin do
describe 'Cancelling merge request in merge train', :runner, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/340885' } do
before(:all) do before(:all) do
executor = "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" executor = "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}"
@file_name = Faker::File.unique.file_name @file_name = Faker::File.unique.file_name
...@@ -89,12 +88,8 @@ module QA ...@@ -89,12 +88,8 @@ module QA
@user.remove_via_api! @user.remove_via_api!
end end
context 'when system cancels the merge request' do context 'when system cancels the merge request', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/324122', type: :bug } do
it( it 'creates a TODO task', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347666' do
'creates a TODO task',
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347666',
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/324122' # type: :bug
) do
# Create a merge conflict # Create a merge conflict
Resource::Repository::Commit.fabricate_via_api! do |commit| Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.api_client = @user_api_client commit.api_client = @user_api_client
...@@ -127,11 +122,7 @@ module QA ...@@ -127,11 +122,7 @@ module QA
end end
context 'when user cancels the merge request' do context 'when user cancels the merge request' do
it( it 'does not create a TODO task', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347665' do
'does not create a TODO task',
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347665',
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/340885' # type: :flaky
) do
# Manually removes merge request from the train # Manually removes merge request from the train
Page::MergeRequest::Show.perform do |show| Page::MergeRequest::Show.perform do |show|
show.wait_until(reload: false) do show.wait_until(reload: false) do
......
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