From 035a38f18ea7bec1afd64218866a2fd986449b00 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 7 Sep 2016 16:18:15 +0300
Subject: [PATCH] Fix issuable_bulk_update_path and merge request spinach test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/helpers/issuables_helper.rb | 6 +++---
features/steps/project/merge_requests.rb | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 70ff7f9c1b2..3f5af880646 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -113,10 +113,10 @@ module IssuablesHelper
end
def issuable_bulk_update_path(type)
- if type == "issue"
- bulk_update_namespace_project_issues_path(@project.namespace, @project)
- else
+ if type == :merge_requests
bulk_update_namespace_project_merge_requests_path(@project.namespace, @project)
+ else
+ bulk_update_namespace_project_issues_path(@project.namespace, @project)
end
end
end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 56b28949585..df17b5626c6 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -31,7 +31,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click link "Closed"' do
- click_link "Closed"
+ page.within('.issues-state-filters') do
+ click_link "Closed"
+ end
end
step 'I should see merge request "Wiki Feature"' do
--
GitLab