Add latest changes from gitlab-org/gitlab@master

2 files changed, 46 insertions, 12 deletions

diff --git a/spec/features/search/user_searches_for_issues_spec.rb b/spec/features/search/user_searches_for_issues_spec.rb
index e9943347522..d895e87f1cb 100644
--- a/spec/features/search/user_searches_for_issues_spec.rb
+++ b/spec/features/search/user_searches_for_issues_spec.rb
@@ -6,7 +6,13 @@ RSpec.describe 'User searches for issues', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let!(:issue1) { create(:issue, title: 'Foo', project: project) }
-  let!(:issue2) { create(:issue, title: 'Bar', project: project) }
+  let!(:issue2) { create(:issue, :closed, :confidential, title: 'Bar', project: project) }
+
+  def search_for_issue(search)
+    fill_in('dashboard_search', with: search)
+    find('.btn-search').click
+    select_search_scope('Issues')
+  end
 
   context 'when signed in' do
     before do
@@ -19,9 +25,7 @@ RSpec.describe 'User searches for issues', :js do
     include_examples 'top right search form'
 
     it 'finds an issue' do
-      fill_in('dashboard_search', with: issue1.title)
-      find('.btn-search').click
-      select_search_scope('Issues')
+      search_for_issue(issue1.title)
 
       page.within('.results') do
         expect(page).to have_link(issue1.title)
@@ -29,6 +33,40 @@ RSpec.describe 'User searches for issues', :js do
       end
     end
 
+    it 'hides confidential icon for non-confidential issues' do
+      search_for_issue(issue1.title)
+
+      page.within('.results') do
+        expect(page).not_to have_css('[data-testid="eye-slash-icon"]')
+      end
+    end
+
+    it 'shows confidential icon for confidential issues' do
+      search_for_issue(issue2.title)
+
+      page.within('.results') do
+        expect(page).to have_css('[data-testid="eye-slash-icon"]')
+      end
+    end
+
+    it 'shows correct badge for open issues' do
+      search_for_issue(issue1.title)
+
+      page.within('.results') do
+        expect(page).to have_css('.badge-success')
+        expect(page).not_to have_css('.badge-info')
+      end
+    end
+
+    it 'shows correct badge for closed issues' do
+      search_for_issue(issue2.title)
+
+      page.within('.results') do
+        expect(page).not_to have_css('.badge-success')
+        expect(page).to have_css('.badge-info')
+      end
+    end
+
     context 'when on a project page' do
       it 'finds an issue' do
         find('.js-search-project-dropdown').click
@@ -37,9 +75,7 @@ RSpec.describe 'User searches for issues', :js do
           click_link(project.full_name)
         end
 
-        fill_in('dashboard_search', with: issue1.title)
-        find('.btn-search').click
-        select_search_scope('Issues')
+        search_for_issue(issue1.title)
 
         page.within('.results') do
           expect(page).to have_link(issue1.title)
@@ -59,9 +95,7 @@ RSpec.describe 'User searches for issues', :js do
     include_examples 'top right search form'
 
     it 'finds an issue' do
-      fill_in('dashboard_search', with: issue1.title)
-      find('.btn-search').click
-      select_search_scope('Issues')
+      search_for_issue(issue1.title)
 
       page.within('.results') do
         expect(page).to have_link(issue1.title)
diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb
index 37e83d1e888..cfda25b9ab4 100644
--- a/spec/features/search/user_uses_header_search_field_spec.rb
+++ b/spec/features/search/user_uses_header_search_field_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe 'User uses header search field', :js do
 
     context 'when using the keyboard shortcut' do
       before do
-        find('#search.js-autocomplete-disabled')
+        find('#search')
         find('body').native.send_keys('s')
       end
 
@@ -39,7 +39,7 @@ RSpec.describe 'User uses header search field', :js do
 
     context 'when clicking the search field' do
       before do
-        page.find('#search.js-autocomplete-disabled').click
+        page.find('#search').click
       end
 
       it 'shows category search dropdown' do