From c47dfc9e56e783ad95690d050d88ec6bf742bd9d Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 12 May 2017 20:46:16 +0100 Subject: Check for filtered-search before constructing filteredsearchmanager --- app/assets/javascripts/dispatcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 1a791395d6f..70bde243bd9 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -120,7 +120,7 @@ const ShortcutsBlob = require('./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(); -- cgit v1.2.1 From dfe3ca5ec13a7fc2913b0ef26ddc87cecf0e134a Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 12 May 2017 21:32:08 +0100 Subject: Added specs to test for subgroup titles on issue and mr pages --- spec/features/projects/sub_group_issuables_spec.rb | 29 ++++++++++++++++++++++ spec/support/features/has_subgroup_title_spec.rb | 8 ++++++ 2 files changed, 37 insertions(+) create mode 100644 spec/features/projects/sub_group_issuables_spec.rb create mode 100644 spec/support/features/has_subgroup_title_spec.rb diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb new file mode 100644 index 00000000000..848a06cf335 --- /dev/null +++ b/spec/features/projects/sub_group_issuables_spec.rb @@ -0,0 +1,29 @@ +require 'spec_helper' + +describe 'Subgroup Issuables', :feature, :js do + let!(:parent_group) { create(:group, name: 'parentgroup') } + let!(:subgroup) { create(:group, parent: 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 + + context 'empty issues index' do + before do + visit namespace_project_issues_path(project.namespace, project) + end + + it_behaves_like 'has subgroup title', 'parentgroup', 'subgroup', 'project' + end + + context 'empty merge request index' do + before do + visit namespace_project_merge_requests_path(project.namespace, project) + end + + it_behaves_like 'has subgroup title', 'parentgroup', 'subgroup', 'project' + end +end diff --git a/spec/support/features/has_subgroup_title_spec.rb b/spec/support/features/has_subgroup_title_spec.rb new file mode 100644 index 00000000000..b631eeeec3a --- /dev/null +++ b/spec/support/features/has_subgroup_title_spec.rb @@ -0,0 +1,8 @@ +shared_examples 'has subgroup title' do |parent_group_name, subgroup_name, project_name| + it 'should show the full title' do + title = find('.title-container') + + expect(title).not_to have_selector '.initializing' + expect(title).to have_content "#{parent_group_name} / #{subgroup_name} / #{project_name}" + end +end -- cgit v1.2.1 From e04830445619b17bd2fce34583f08fc295cb30ad Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 25 May 2017 15:20:21 +0100 Subject: Remove 'should' from scenario in has_subgroup_title_spec.rb --- spec/support/features/has_subgroup_title_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/support/features/has_subgroup_title_spec.rb b/spec/support/features/has_subgroup_title_spec.rb index b631eeeec3a..2a852817c94 100644 --- a/spec/support/features/has_subgroup_title_spec.rb +++ b/spec/support/features/has_subgroup_title_spec.rb @@ -1,5 +1,5 @@ shared_examples 'has subgroup title' do |parent_group_name, subgroup_name, project_name| - it 'should show the full title' do + it 'shows the full title' do title = find('.title-container') expect(title).not_to have_selector '.initializing' -- cgit v1.2.1 From 56797a84c82b673d15cbfa6825e65c63e8d1636e Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 25 May 2017 15:26:18 +0100 Subject: Remove shared example and improve sub_group_issuables_spec.rb --- spec/features/projects/sub_group_issuables_spec.rb | 31 ++++++++++++---------- spec/support/features/has_subgroup_title_spec.rb | 8 ------ 2 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 spec/support/features/has_subgroup_title_spec.rb diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb index 848a06cf335..cf21b208f65 100644 --- a/spec/features/projects/sub_group_issuables_spec.rb +++ b/spec/features/projects/sub_group_issuables_spec.rb @@ -1,29 +1,32 @@ require 'spec_helper' describe 'Subgroup Issuables', :feature, :js do - let!(:parent_group) { create(:group, name: 'parentgroup') } - let!(:subgroup) { create(:group, parent: parent_group, name: 'subgroup') } - let!(:project) { create(:empty_project, namespace: subgroup, name: 'project') } - let(:user) { create(:user) } + 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 - context 'empty issues index' do - before do - visit namespace_project_issues_path(project.namespace, project) - 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) - it_behaves_like 'has subgroup title', 'parentgroup', 'subgroup', 'project' + expect_to_have_full_subgroup_title end - context 'empty merge request index' do - before do - visit namespace_project_merge_requests_path(project.namespace, project) - 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) - it_behaves_like 'has subgroup title', 'parentgroup', 'subgroup', 'project' + 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 diff --git a/spec/support/features/has_subgroup_title_spec.rb b/spec/support/features/has_subgroup_title_spec.rb deleted file mode 100644 index 2a852817c94..00000000000 --- a/spec/support/features/has_subgroup_title_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -shared_examples 'has subgroup title' do |parent_group_name, subgroup_name, project_name| - it 'shows the full title' do - title = find('.title-container') - - expect(title).not_to have_selector '.initializing' - expect(title).to have_content "#{parent_group_name} / #{subgroup_name} / #{project_name}" - end -end -- cgit v1.2.1