Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'

Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347
This commit is contained in:
Phil Hughes 2017-05-25 16:22:29 +00:00
commit d70f7f5d25
2 changed files with 33 additions and 1 deletions

View File

@ -123,7 +123,7 @@ import ShortcutsBlob from './shortcuts_blob';
break;
case 'projects:merge_requests:index':
case 'projects:issues:index':
if (gl.FilteredSearchManager) {
if (gl.FilteredSearchManager && document.querySelector('.filtered-search')) {
new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests');
}
Issuable.init();

View File

@ -0,0 +1,32 @@
require 'spec_helper'
describe 'Subgroup Issuables', :feature, :js do
let!(:group) { create(:group, name: 'group') }
let!(:subgroup) { create(:group, parent: group, name: 'subgroup') }
let!(:project) { create(:empty_project, namespace: subgroup, name: 'project') }
let(:user) { create(:user) }
before do
project.add_master(user)
login_as user
end
it 'shows the full subgroup title when issues index page is empty' do
visit namespace_project_issues_path(project.namespace.to_param, project.to_param)
expect_to_have_full_subgroup_title
end
it 'shows the full subgroup title when merge requests index page is empty' do
visit namespace_project_merge_requests_path(project.namespace.to_param, project.to_param)
expect_to_have_full_subgroup_title
end
def expect_to_have_full_subgroup_title
title = find('.title-container')
expect(title).not_to have_selector '.initializing'
expect(title).to have_content 'group / subgroup / project'
end
end