kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Condense the "new_dropdown" layout partial

Browse source 
After converting the test that verifies this partial's behavior from a
feature spec to a view spec, we're able to remove a few CSS classes that
were only used for scoping tests found in the feature spec. All the view
spec needs is the `have_link` matcher which allows us to check for a
specific `href` attribute.
This commit is contained in:
Robert Speicher 2018-11-23 17:50:54 -05:00
parent c0fcf120b7
commit 6d754eb180
No known key found for this signature in database
GPG key ID: 1D812769A7706642
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/views/layouts/header/_new_dropdown.haml
View file

@ -7,15 +7,14 @@
- if @group&.persisted?
- create_group_project = can?(current_user, :create_projects, @group)
- create_group_subgroup = can?(current_user, :create_subgroup, @group)
- if create_group_project || create_group_subgroup
%li.dropdown-bold-header
= _('This group')
- if create_group_project
%li.header-new-group-project
= link_to _('New project'), new_project_path(namespace_id: @group.id)
%li= link_to _('New project'), new_project_path(namespace_id: @group.id)
- if create_group_subgroup
%li
= link_to _('New subgroup'), new_group_path(parent_id: @group.id)
%li= link_to _('New subgroup'), new_group_path(parent_id: @group.id)
%li.divider
%li.dropdown-bold-header GitLab
@ -23,25 +22,20 @@
- create_project_issue = show_new_issue_link?(@project)
- merge_project = merge_request_source_project_for_project(@project)
- create_project_snippet = can?(current_user, :create_project_snippet, @project)
- if create_project_issue || merge_project || create_project_snippet
%li.dropdown-bold-header
= _('This project')
- if create_project_issue
%li
= link_to _('New issue'), new_project_issue_path(@project)
%li= link_to _('New issue'), new_project_issue_path(@project)
- if merge_project
%li
= link_to _('New merge request'), project_new_merge_request_path(merge_project)
%li= link_to _('New merge request'), project_new_merge_request_path(merge_project)
- if create_project_snippet
%li.header-new-project-snippet
= link_to _('New snippet'), new_project_snippet_path(@project)
%li= link_to _('New snippet'), new_project_snippet_path(@project)
%li.divider
%li.dropdown-bold-header GitLab
- if current_user.can_create_project?
%li
= link_to _('New project'), new_project_path, class: 'qa-global-new-project-link'
%li= link_to _('New project'), new_project_path, class: 'qa-global-new-project-link'
- if current_user.can_create_group?
%li
= link_to _('New group'), new_group_path
%li
= link_to _('New snippet'), new_snippet_path
%li= link_to _('New group'), new_group_path
%li= link_to _('New snippet'), new_snippet_path