diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-31 17:23:48 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-31 17:23:48 +0200 |
| commit | bce6536134ceef28ad4caed03b95639ec39d4ac2 (patch) | |
| tree | e4fa475ff743a62872c86d4808bd112e0ee8fc4f | |
| parent | e4e6b34e5ee682807fc11f7091310d0ea4dae91c (diff) | |
| download | gitlab-ce-bce6536134ceef28ad4caed03b95639ec39d4ac2.tar.gz | |
Fixing more broken unscoped tests
| -rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 6 | ||||
| -rw-r--r-- | spec/features/admin/admin_groups_spec.rb | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index ac8c9070f7d..9b9719a26dd 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -3,7 +3,7 @@ = icon('plus fw') = icon('caret-down') .dropdown-menu-nav.dropdown-menu-align-right - %ul + %ul - if @group - create_group_project = can?(current_user, :create_projects, @group) - create_group_subgroup = can?(current_user, :create_subgroup, @group) @@ -18,13 +18,13 @@ %li.divider %li.dropdown-bold-header GitLab - - if @project + - if @project && @project.namespace - create_project_issue = can?(current_user, :create_issue, @project) - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@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 + - if create_project_issue %li = link_to 'New issue', new_namespace_project_issue_path(@project.namespace, @project) - if merge_project diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb index d5f595894d6..cf9d7bca255 100644 --- a/spec/features/admin/admin_groups_spec.rb +++ b/spec/features/admin/admin_groups_spec.rb @@ -24,7 +24,9 @@ feature 'Admin Groups', feature: true do it 'creates new group' do visit admin_groups_path - click_link "New group" + page.within '#content-body' do + click_link "New group" + end path_component = 'gitlab' group_name = 'GitLab group name' group_description = 'Description of group for GitLab' |