summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-07-07 21:17:23 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-07-07 21:17:23 +0000
commit5541e55c491eb86567c8c1f28457e894a4155dd1 (patch)
tree1fd84776d751c33665aca26c1e4d4eac624fd295 /spec
parent86d238e4bda6424a79eb9d8ea7cfe41af714f49f (diff)
parente486bbfd34bc962ddc6e7a0433a5b0cce74603a7 (diff)
downloadgitlab-ce-5541e55c491eb86567c8c1f28457e894a4155dd1.tar.gz
Merge branch 'issues-blank-state' into 'master'
Added blank state to issues ## What does this MR do? Adds new blank state to issues when no issues exist. Part of #18519 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png) See merge request !4908
Diffstat (limited to 'spec')
-rw-r--r--spec/features/issues/filter_issues_spec.rb4
-rw-r--r--spec/features/search_spec.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 006a06b8235..4b9b5394b61 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -7,6 +7,7 @@ describe 'Filter issues', feature: true do
let!(:user) { create(:user)}
let!(:milestone) { create(:milestone, project: project) }
let!(:label) { create(:label, project: project) }
+ let!(:issue1) { create(:issue, project: project) }
before do
project.team << [user, :master]
@@ -196,6 +197,7 @@ describe 'Filter issues', feature: true do
page.within '.labels-filter' do
click_link 'bug'
end
+ find('.dropdown-menu-close-icon').click
page.within '.issues-list' do
expect(page).to have_selector('.issue', count: 1)
@@ -287,7 +289,7 @@ describe 'Filter issues', feature: true do
wait_for_ajax
page.within '.issues-list' do
- expect(first('.issue')).to have_content('Frontend')
+ expect(page).to have_content('Frontend')
end
end
end
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 85923f0a19d..d0a301038c4 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -3,6 +3,8 @@ require 'spec_helper'
describe "Search", feature: true do
let(:user) { create(:user) }
let(:project) { create(:project, namespace: user.namespace) }
+ let!(:issue) { create(:issue, project: project, assignee: user) }
+ let!(:issue2) { create(:issue, project: project, author: user) }
before do
login_with(user)