diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /spec/helpers/issues_helper_spec.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'spec/helpers/issues_helper_spec.rb')
-rw-r--r-- | spec/helpers/issues_helper_spec.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index 065ac526ae4..2f57657736d 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -300,6 +300,7 @@ RSpec.describe IssuesHelper do has_any_issues: project_issues(project).exists?.to_s, import_csv_issues_path: '#', initial_email: project.new_issuable_address(current_user, 'issue'), + initial_sort: current_user&.user_preference&.issues_sort, is_anonymous_search_disabled: 'true', is_issue_repositioning_disabled: 'true', is_project: 'true', @@ -342,8 +343,6 @@ RSpec.describe IssuesHelper do describe '#group_issues_list_data' do let(:group) { create(:group) } let(:current_user) { double.as_null_object } - let(:issues) { [] } - let(:projects) { [] } it 'returns expected result' do allow(helper).to receive(:current_user).and_return(current_user) @@ -351,20 +350,23 @@ RSpec.describe IssuesHelper do allow(helper).to receive(:image_path).and_return('#') allow(helper).to receive(:url_for).and_return('#') + assign(:has_issues, false) + assign(:has_projects, true) + expected = { autocomplete_award_emojis_path: autocomplete_award_emojis_path, calendar_path: '#', empty_state_svg_path: '#', full_path: group.full_path, - has_any_issues: issues.to_a.any?.to_s, - has_any_projects: any_projects?(projects).to_s, + has_any_issues: false.to_s, + has_any_projects: true.to_s, is_signed_in: current_user.present?.to_s, jira_integration_path: help_page_url('integration/jira/issues', anchor: 'view-jira-issues'), rss_path: '#', sign_in_path: new_user_session_path } - expect(helper.group_issues_list_data(group, current_user, issues, projects)).to include(expected) + expect(helper.group_issues_list_data(group, current_user)).to include(expected) end end |