summaryrefslogtreecommitdiff
path: root/spec/features/boards/sidebar_spec.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
committerStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
commit09baadca349670822645b56a17e9bf8716e997b6 (patch)
tree397bb26f3a0e851b39c57351cbe6963adc47dea8 /spec/features/boards/sidebar_spec.rb
parentded77e21b38dbb65aec2aeae42de02e6571fe01a (diff)
parent2925850ceec3ef89eb1f60b0a648dbc5f72d8683 (diff)
downloadgitlab-ce-09baadca349670822645b56a17e9bf8716e997b6.tar.gz
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/boards/sidebar_spec.rb')
-rw-r--r--spec/features/boards/sidebar_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index 9b3fb48046a..b3e418bc0f7 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe 'Issue Boards', js: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
- let(:project) { create(:empty_project, :public) }
+ let(:project) { create(:project, :public) }
let!(:milestone) { create(:milestone, project: project) }
let!(:development) { create(:label, project: project, name: 'Development') }
let!(:bug) { create(:label, project: project, name: 'Bug') }
@@ -257,7 +257,7 @@ describe 'Issue Boards', js: true do
end
end
- expect(card).to have_selector('.label', count: 2)
+ expect(card).to have_selector('.label', count: 3)
expect(card).to have_content(bug.title)
end
@@ -283,7 +283,7 @@ describe 'Issue Boards', js: true do
end
end
- expect(card).to have_selector('.label', count: 3)
+ expect(card).to have_selector('.label', count: 4)
expect(card).to have_content(bug.title)
expect(card).to have_content(regression.title)
end
@@ -308,7 +308,7 @@ describe 'Issue Boards', js: true do
end
end
- expect(card).not_to have_selector('.label')
+ expect(card).to have_selector('.label', count: 1)
expect(card).not_to have_content(stretch.title)
end
end