diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 18:10:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 18:10:12 +0000 |
commit | 52e32e255f7d868c4ec952a201bb8813b5e03703 (patch) | |
tree | 4b1678207027093c6f0cf0ad0dfa07979fad2092 /spec/helpers | |
parent | 42d13aebd3c47671337d871e8b349385dade5252 (diff) | |
download | gitlab-ce-52e32e255f7d868c4ec952a201bb8813b5e03703.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/avatars_helper_spec.rb | 4 | ||||
-rw-r--r-- | spec/helpers/issues_helper_spec.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/spec/helpers/avatars_helper_spec.rb b/spec/helpers/avatars_helper_spec.rb index c4366cffd7f..047a6ca0b7d 100644 --- a/spec/helpers/avatars_helper_spec.rb +++ b/spec/helpers/avatars_helper_spec.rb @@ -11,7 +11,7 @@ RSpec.describe AvatarsHelper do shared_examples 'resource with a default avatar' do |source_type| it 'returns a default avatar div' do expect(public_send("#{source_type}_icon", *helper_args)) - .to match(%r{<div class="identicon bg\d+">F</div>}) + .to match(%r{<span class="identicon bg\d+">F</span>}) end end @@ -434,7 +434,7 @@ RSpec.describe AvatarsHelper do let(:resource) { build_stubbed(:group, name: 'foo') } it 'displays group avatar' do - is_expected.to match(%r{<div class="avatar identicon bg\d+ s32">F</div>}) + is_expected.to match(%r{<span class="avatar identicon bg\d+ s32">F</span>}) end end end diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index 762c105741b..b3fda455b2f 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -300,20 +300,25 @@ RSpec.describe IssuesHelper do can_edit: 'true', can_import_issues: 'true', email: current_user&.notification_email, + emails_help_page_path: help_page_path('development/emails', anchor: 'email-namespace'), empty_state_svg_path: '#', endpoint: expose_path(api_v4_projects_issues_path(id: project.id)), export_csv_path: export_csv_project_issues_path(project), has_issues: project_issues(project).exists?.to_s, import_csv_issues_path: '#', + initial_email: project.new_issuable_address(current_user, 'issue'), is_signed_in: current_user.present?.to_s, issues_path: project_issues_path(project), jira_integration_path: help_page_url('user/project/integrations/jira', anchor: 'view-jira-issues'), + markdown_help_path: help_page_path('user/markdown'), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), new_issue_path: new_project_issue_path(project, issue: { assignee_id: finder.assignee.id, milestone_id: finder.milestones.first.id }), project_import_jira_path: project_import_jira_path(project), project_labels_path: project_labels_path(project, include_ancestor_groups: true, format: :json), project_milestones_path: project_milestones_path(project, format: :json), project_path: project.full_path, + quick_actions_help_path: help_page_path('user/project/quick_actions'), + reset_path: new_issuable_address_project_path(project, issuable_type: 'issue'), rss_path: '#', show_new_issue_link: 'true', sign_in_path: new_user_session_path |