Commit 48b025d1 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'quarantine-flaky-tests' into 'master'

Resolve "Flaky tests: spec/requests/api/badges_spec.rb"

Closes #60397

See merge request gitlab-org/gitlab-ce!27484
parents d0abcc1a bfc8ac3e
...@@ -73,7 +73,7 @@ describe API::Badges do ...@@ -73,7 +73,7 @@ describe API::Badges do
let(:badge) { source.badges.first } let(:badge) { source.badges.first }
context "as a #{type}" do context "as a #{type}" do
it 'returns 200' do it 'returns 200', :quarantine do
user = public_send(type) user = public_send(type)
get api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", user) get api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", user)
...@@ -193,7 +193,7 @@ describe API::Badges do ...@@ -193,7 +193,7 @@ describe API::Badges do
end end
context 'when authenticated as a maintainer/owner' do context 'when authenticated as a maintainer/owner' do
it 'updates the member' do it 'updates the member', :quarantine do
put api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", maintainer), put api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", maintainer),
params: { link_url: example_url, image_url: example_url2 } params: { link_url: example_url, image_url: example_url2 }
...@@ -239,7 +239,7 @@ describe API::Badges do ...@@ -239,7 +239,7 @@ describe API::Badges do
end end
end end
context 'when authenticated as a maintainer/owner' do context 'when authenticated as a maintainer/owner', :quarantine do
it 'deletes the badge' do it 'deletes the badge' do
expect do expect do
delete api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", maintainer) delete api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", maintainer)
......
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