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
603ceea2
Commit
603ceea2
authored
Jul 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests and improve logic
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b28714b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
lib/api/settings.rb
lib/api/settings.rb
+2
-1
spec/requests/api/settings_spec.rb
spec/requests/api/settings_spec.rb
+16
-4
No files found.
lib/api/settings.rb
View file @
603ceea2
...
@@ -4,7 +4,8 @@ module API
...
@@ -4,7 +4,8 @@ module API
helpers
do
helpers
do
def
current_settings
def
current_settings
@current_setting
||=
ApplicationSetting
.
current
@current_setting
||=
(
ApplicationSetting
.
current
||
ApplicationSetting
.
create_from_defaults
)
end
end
end
end
...
...
spec/requests/api/settings_spec.rb
View file @
603ceea2
...
@@ -7,11 +7,23 @@ describe API::API, 'Settings', api: true do
...
@@ -7,11 +7,23 @@ describe API::API, 'Settings', api: true do
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:admin
)
{
create
(
:admin
)
}
describe
"GET /applicaiton/settings"
do
describe
"GET /application/settings"
do
# TODO: Implement
it
"should return application settings"
do
get
api
(
"/application/settings"
,
admin
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
).
to
be_an
Hash
expect
(
json_response
[
'default_projects_limit'
]).
to
eq
(
42
)
expect
(
json_response
[
'signin_enabled'
]).
to
be_truthy
end
end
end
describe
"PUT /applicaiton/settings"
do
describe
"PUT /application/settings"
do
# TODO: Implement
it
"should update application settings"
do
put
api
(
"/application/settings"
,
admin
),
default_projects_limit:
3
,
signin_enabled:
false
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
'default_projects_limit'
]).
to
eq
(
3
)
expect
(
json_response
[
'signin_enabled'
]).
to
be_falsey
end
end
end
end
end
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