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
01960fce
Commit
01960fce
authored
Jun 27, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix optional args for POST :id/variables
Always use declared_params(include_missing: false) so that we don't give nils for optional arguments
parent
ad3843ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
variables.rb
lib/api/variables.rb
+1
-1
variables_spec.rb
spec/requests/api/variables_spec.rb
+11
-0
No files found.
lib/api/variables.rb
View file @
01960fce
...
...
@@ -45,7 +45,7 @@ module API
optional
:protected
,
type:
String
,
desc:
'Whether the variable is protected'
end
post
':id/variables'
do
variable
=
user_project
.
variables
.
create
(
declared
(
params
,
include_parent_namespaces:
false
).
to_h
)
variable
=
user_project
.
variables
.
create
(
declared
_params
(
include_missing:
false
)
)
if
variable
.
valid?
present
variable
,
with:
Entities
::
Variable
...
...
spec/requests/api/variables_spec.rb
View file @
01960fce
...
...
@@ -82,6 +82,17 @@ describe API::Variables do
expect
(
json_response
[
'protected'
]).
to
be_truthy
end
it
'creates variable with optional attributes'
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/variables"
,
user
),
key:
'TEST_VARIABLE_2'
,
value:
'VALUE_2'
end
.
to
change
{
project
.
variables
.
count
}.
by
(
1
)
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'key'
]).
to
eq
(
'TEST_VARIABLE_2'
)
expect
(
json_response
[
'value'
]).
to
eq
(
'VALUE_2'
)
expect
(
json_response
[
'protected'
]).
to
be_falsey
end
it
'does not allow to duplicate variable key'
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/variables"
,
user
),
key:
variable
.
key
,
value:
'VALUE_2'
...
...
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