summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-04-19 12:25:51 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-04-19 12:25:51 +0000
commit48b025d188420b46bfd0df79f5c1f1bdde65c138 (patch)
tree106b60bedf479cffc1e57c90d6b600108558bd49
parentd0abcc1a2b60dadc24e8d8f0d019b4b19688853a (diff)
parentbfc8ac3e855f9ebb3a9bc9c335077e4120b46b06 (diff)
downloadgitlab-ce-48b025d188420b46bfd0df79f5c1f1bdde65c138.tar.gz
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
-rw-r--r--spec/requests/api/badges_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/badges_spec.rb b/spec/requests/api/badges_spec.rb
index 1271324a2ba..1dd0cb4817c 100644
--- a/spec/requests/api/badges_spec.rb
+++ b/spec/requests/api/badges_spec.rb
@@ -73,7 +73,7 @@ describe API::Badges do
let(:badge) { source.badges.first }
context "as a #{type}" do
- it 'returns 200' do
+ it 'returns 200', :quarantine do
user = public_send(type)
get api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", user)
@@ -193,7 +193,7 @@ describe API::Badges do
end
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),
params: { link_url: example_url, image_url: example_url2 }
@@ -239,7 +239,7 @@ describe API::Badges do
end
end
- context 'when authenticated as a maintainer/owner' do
+ context 'when authenticated as a maintainer/owner', :quarantine do
it 'deletes the badge' do
expect do
delete api("/#{source_type.pluralize}/#{source.id}/badges/#{badge.id}", maintainer)