diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-29 11:28:20 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-29 11:28:20 +0200 |
| commit | e4e6b34e5ee682807fc11f7091310d0ea4dae91c (patch) | |
| tree | e85d44f2a556e83285fa679ba0df7ede61c180db | |
| parent | e8a305170b33f06012def2afa80326c55257128a (diff) | |
| download | gitlab-ce-e4e6b34e5ee682807fc11f7091310d0ea4dae91c.tar.gz | |
Check for Merge Request fixed
Fixed couple of spinach test
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 3 | ||||
| -rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 2 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 4 | ||||
| -rw-r--r-- | features/steps/project/snippets.rb | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 9613006d021..2ee95483040 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -267,7 +267,8 @@ padding: 0 16px; } - .separator + .dropdown-header, .separator + .dropdown-bold-header { + .separator + .dropdown-header, + .separator + .dropdown-bold-header { padding-top: 2px; } diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index e9d45802bac..ac8c9070f7d 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -22,7 +22,7 @@ - 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 || create_project_mr || create_project_snippet) + - if (create_project_issue || merge_project || create_project_snippet) %li.dropdown-bold-header This project - if create_project_issue %li diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 54b6352c952..17d190711f5 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -14,7 +14,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I click link "New Merge Request"' do - page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request') + page.within '#content-body' do + page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request') + end end step 'I click link "Bug NS-04"' do diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb index e3f5e9e3ef3..dd49701a3d9 100644 --- a/features/steps/project/snippets.rb +++ b/features/steps/project/snippets.rb @@ -23,7 +23,9 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps end step 'I click link "New snippet"' do - first(:link, "New snippet").click + page.within '#content-body' do + first(:link, "New snippet").click + end end step 'I click link "Snippet one"' do |