Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
07b0615e
Commit
07b0615e
authored
Jun 27, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed typo and hash alighment
parent
d1fae597
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+3
-1
spec/support/matchers/access_matchers_for_controller.rb
spec/support/matchers/access_matchers_for_controller.rb
+2
-2
No files found.
spec/controllers/projects/pipeline_schedules_controller_spec.rb
View file @
07b0615e
...
@@ -128,7 +128,9 @@ describe Projects::PipelineSchedulesController do
...
@@ -128,7 +128,9 @@ describe Projects::PipelineSchedulesController do
let
(
:action
)
do
let
(
:action
)
do
proc
do
|
user
|
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
,
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
,
schedule:
{
description:
'a'
}
schedule:
{
description:
'a'
}
end
end
end
end
...
...
spec/support/matchers/access_matchers_for_controller.rb
View file @
07b0615e
...
@@ -25,7 +25,7 @@ module AccessMatchersForController
...
@@ -25,7 +25,7 @@ module AccessMatchersForController
user
=
role
user
=
role
sign_in
(
user
)
sign_in
(
user
)
when
*
Gitlab
::
Access
.
sym_options_with_owner
.
keys
# owner, master, developer, reporter, guest
when
*
Gitlab
::
Access
.
sym_options_with_owner
.
keys
# owner, master, developer, reporter, guest
user
=
c
er
ate_user_by_membership
(
role
,
membership
)
user
=
c
re
ate_user_by_membership
(
role
,
membership
)
sign_in
(
user
)
sign_in
(
user
)
else
else
raise
ArgumentError
,
"cannot emulate user
#{
role
}
"
raise
ArgumentError
,
"cannot emulate user
#{
role
}
"
...
@@ -34,7 +34,7 @@ module AccessMatchersForController
...
@@ -34,7 +34,7 @@ module AccessMatchersForController
user
user
end
end
def
c
er
ate_user_by_membership
(
role
,
membership
=
nil
)
def
c
re
ate_user_by_membership
(
role
,
membership
=
nil
)
raise
ArgumentError
,
"cannot emulate
#{
role
}
without membership parent"
unless
membership
raise
ArgumentError
,
"cannot emulate
#{
role
}
without membership parent"
unless
membership
if
role
==
:owner
&&
membership
.
owner
if
role
==
:owner
&&
membership
.
owner
...
...
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