diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-22 14:39:13 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-22 14:39:13 +0200 |
commit | dfc2fe774de3a1768afe4e2fb24f32858b430da5 (patch) | |
tree | e48fe78c941cb3d42700eeeada4d912775fd0c46 /spec | |
parent | 2450625bbc1a9838b4ab76b652dfa1899c777927 (diff) | |
download | gitlab-ce-dfc2fe774de3a1768afe4e2fb24f32858b430da5.tar.gz |
Revert "Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master'
"
This reverts commit 8ed5be5935a77fffe730baa188d1e1fc1c739d72, reversing
changes made to fb0d1378f4f3365a9cae0938829da0560a92b6e6.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/filter_by_labels_spec.rb | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb index 7e2abd759e1..908b18e5339 100644 --- a/spec/features/issues/filter_by_labels_spec.rb +++ b/spec/features/issues/filter_by_labels_spec.rb @@ -6,19 +6,20 @@ feature 'Issue filtering by Labels', feature: true do let(:project) { create(:project, :public) } let!(:user) { create(:user)} let!(:label) { create(:label, project: project) } - let(:bug) { create(:label, project: project, title: 'bug') } - let(:feature) { create(:label, project: project, title: 'feature') } - let(:enhancement) { create(:label, project: project, title: 'enhancement') } - let(:issue1) { create(:issue, title: "Bugfix1", project: project) } - let(:issue2) { create(:issue, title: "Bugfix2", project: project) } - let(:issue3) { create(:issue, title: "Feature1", project: project) } before do + bug = create(:label, project: project, title: 'bug') + feature = create(:label, project: project, title: 'feature') + enhancement = create(:label, project: project, title: 'enhancement') + + issue1 = create(:issue, title: "Bugfix1", project: project) issue1.labels << bug + issue2 = create(:issue, title: "Bugfix2", project: project) issue2.labels << bug issue2.labels << enhancement + issue3 = create(:issue, title: "Feature1", project: project) issue3.labels << feature project.team << [user, :master] @@ -158,13 +159,6 @@ feature 'Issue filtering by Labels', feature: true do wait_for_ajax end - it 'shows a correct "Open" counter' do - page.within '.issues-state-filters' do - expect(page).not_to have_content "{#{issue2.id} => 1}" - expect(page).to have_content "Open 1" - end - end - it 'shows issue "Bugfix2" in issues list' do expect(page).to have_content "Bugfix2" end |