BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
035a38f1
Commit
035a38f1
authored
Sep 07, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issuable_bulk_update_path and merge request spinach test
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
af9dc973
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
issuables_helper.rb
app/helpers/issuables_helper.rb
+3
-3
merge_requests.rb
features/steps/project/merge_requests.rb
+3
-1
No files found.
app/helpers/issuables_helper.rb
View file @
035a38f1
...
@@ -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
features/steps/project/merge_requests.rb
View file @
035a38f1
...
@@ -31,7 +31,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -31,7 +31,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I click link "Closed"'
do
step
'I click link "Closed"'
do
click_link
"Closed"
page
.
within
(
'.issues-state-filters'
)
do
click_link
"Closed"
end
end
end
step
'I should see merge request "Wiki Feature"'
do
step
'I should see merge request "Wiki Feature"'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment