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
5753acfa
Commit
5753acfa
authored
Mar 06, 2017
by
Adam Niedzielski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move schema definitions for our public API to a separate directory
parent
348dff0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
spec/fixtures/api/schemas/public_api/v4/user/login.json
spec/fixtures/api/schemas/public_api/v4/user/login.json
+0
-0
spec/fixtures/api/schemas/public_api/v4/user/public.json
spec/fixtures/api/schemas/public_api/v4/user/public.json
+0
-0
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+4
-4
No files found.
spec/fixtures/api/schemas/user/login.json
→
spec/fixtures/api/schemas/
public_api/v4/
user/login.json
View file @
5753acfa
File moved
spec/fixtures/api/schemas/user/public.json
→
spec/fixtures/api/schemas/
public_api/v4/
user/public.json
View file @
5753acfa
File moved
spec/requests/api/users_spec.rb
View file @
5753acfa
...
@@ -728,7 +728,7 @@ describe API::Users, api: true do
...
@@ -728,7 +728,7 @@ describe API::Users, api: true do
get
api
(
"/user"
,
user
)
get
api
(
"/user"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
match_response_schema
(
'user/public'
)
expect
(
response
).
to
match_response_schema
(
'
public_api/v4/
user/public'
)
expect
(
json_response
[
'id'
]).
to
eq
(
user
.
id
)
expect
(
json_response
[
'id'
]).
to
eq
(
user
.
id
)
end
end
end
end
...
@@ -747,7 +747,7 @@ describe API::Users, api: true do
...
@@ -747,7 +747,7 @@ describe API::Users, api: true do
get
api
(
"/user?private_token=
#{
admin_personal_access_token
}
"
)
get
api
(
"/user?private_token=
#{
admin_personal_access_token
}
"
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
match_response_schema
(
'user/public'
)
expect
(
response
).
to
match_response_schema
(
'
public_api/v4/
user/public'
)
expect
(
json_response
[
'id'
]).
to
eq
(
admin
.
id
)
expect
(
json_response
[
'id'
]).
to
eq
(
admin
.
id
)
end
end
end
end
...
@@ -757,7 +757,7 @@ describe API::Users, api: true do
...
@@ -757,7 +757,7 @@ describe API::Users, api: true do
get
api
(
"/user?private_token=
#{
admin
.
private_token
}
&sudo=
#{
user
.
id
}
"
)
get
api
(
"/user?private_token=
#{
admin
.
private_token
}
&sudo=
#{
user
.
id
}
"
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
match_response_schema
(
'user/login'
)
expect
(
response
).
to
match_response_schema
(
'
public_api/v4/
user/login'
)
expect
(
json_response
[
'id'
]).
to
eq
(
user
.
id
)
expect
(
json_response
[
'id'
]).
to
eq
(
user
.
id
)
end
end
...
@@ -765,7 +765,7 @@ describe API::Users, api: true do
...
@@ -765,7 +765,7 @@ describe API::Users, api: true do
get
api
(
"/user?private_token=
#{
admin
.
private_token
}
"
)
get
api
(
"/user?private_token=
#{
admin
.
private_token
}
"
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
match_response_schema
(
'user/public'
)
expect
(
response
).
to
match_response_schema
(
'
public_api/v4/
user/public'
)
expect
(
json_response
[
'id'
]).
to
eq
(
admin
.
id
)
expect
(
json_response
[
'id'
]).
to
eq
(
admin
.
id
)
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