Commit 035a38f1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix issuable_bulk_update_path and merge request spinach test

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent af9dc973
...@@ -113,10 +113,10 @@ module IssuablesHelper ...@@ -113,10 +113,10 @@ module IssuablesHelper
end end
def issuable_bulk_update_path(type) def issuable_bulk_update_path(type)
if type == "issue" if type == :merge_requests
bulk_update_namespace_project_issues_path(@project.namespace, @project)
else
bulk_update_namespace_project_merge_requests_path(@project.namespace, @project) bulk_update_namespace_project_merge_requests_path(@project.namespace, @project)
else
bulk_update_namespace_project_issues_path(@project.namespace, @project)
end end
end end
end end
...@@ -31,8 +31,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -31,8 +31,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
step 'I click link "Closed"' do step 'I click link "Closed"' do
page.within('.issues-state-filters') do
click_link "Closed" click_link "Closed"
end end
end
step 'I should see merge request "Wiki Feature"' do step 'I should see merge request "Wiki Feature"' do
page.within '.merge-request' do page.within '.merge-request' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment