diff options
| author | Jan <king-jan1999@hotmail.de> | 2018-04-04 13:37:44 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-04 13:37:44 +0300 |
| commit | c2823a4bda24c2d78219fc47c472276e4cfd7404 (patch) | |
| tree | db050a39442f8474aeca27102b9a6c9327d18a38 /spec/features/protected_branches_spec.rb | |
| parent | 6587a0cdbbe917042e0eecfed67e533f73db7372 (diff) | |
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"
Diffstat (limited to 'spec/features/protected_branches_spec.rb')
| -rw-r--r-- | spec/features/protected_branches_spec.rb | 5 |
1 files changed, 4 insertions, 1 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 |