summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJan <king-jan1999@hotmail.de>2018-04-04 10:37:44 +0000
committerRémy Coutable <remy@rymai.me>2018-04-04 10:37:44 +0000
commitc2823a4bda24c2d78219fc47c472276e4cfd7404 (patch)
treedb050a39442f8474aeca27102b9a6c9327d18a38 /spec
parent6587a0cdbbe917042e0eecfed67e533f73db7372 (diff)
downloadgitlab-ce-c2823a4bda24c2d78219fc47c472276e4cfd7404.tar.gz
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"
Diffstat (limited to 'spec')
-rw-r--r--spec/features/protected_branches_spec.rb5
-rw-r--r--spec/features/protected_tags_spec.rb5
2 files changed, 8 insertions, 2 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index a4084818284..43cabd3b9f2 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -142,7 +142,10 @@ feature 'Protected Branches', :js do
set_protected_branch_name('*-stable')
click_on "Protect"
- within(".protected-branches-list") { expect(page).to have_content("2 matching branches") }
+ within(".protected-branches-list") do
+ expect(page).to have_content("Protected branch (2)")
+ expect(page).to have_content("2 matching branches")
+ end
end
it "displays all the branches matching the wildcard" do
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index 8cc6f17b8d9..efccaeaff6c 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -65,7 +65,10 @@ feature 'Protected Tags', :js do
set_protected_tag_name('*-stable')
click_on "Protect"
- within(".protected-tags-list") { expect(page).to have_content("2 matching tags") }
+ within(".protected-tags-list") do
+ expect(page).to have_content("Protected tag (2)")
+ expect(page).to have_content("2 matching tags")
+ end
end
it "displays all the tags matching the wildcard" do