Skip to content
Snippets Groups Projects
Commit d85dde19 authored by tiagonbotelho's avatar tiagonbotelho
Browse files

adds test to check json fields on simple request and changes the url request format

parent b0b374b8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -3,7 +3,7 @@
groupPath: "/api/:version/groups/:id.json"
namespacesPath: "/api/:version/namespaces.json"
groupProjectsPath: "/api/:version/groups/:id/projects.json"
projectsPath: "/api/:version/projects.json?format=simple"
projectsPath: "/api/:version/projects.json?simple=true"
labelsPath: "/api/:version/projects/:id/labels"
licensePath: "/api/:version/licenses/:key"
gitignorePath: "/api/:version/gitignores/:key"
Loading
Loading
Loading
Loading
@@ -399,7 +399,6 @@ class GitLabDropdown
selected = true
 
# Set URL
console.log(data)
if @options.url?
url = @options.url(data)
else
Loading
Loading
Loading
Loading
@@ -25,7 +25,7 @@ module API
@projects = current_user.authorized_projects
@projects = filter_projects(@projects)
@projects = paginate @projects
if params["format"]
if params["simple"]
present @projects, with: Entities::BasicProjectWithAccess, user: current_user
else
present @projects, with: Entities::ProjectWithAccess, user: current_user
Loading
Loading
Loading
Loading
@@ -22,7 +22,7 @@ describe 'Project Title', ->
@projects_data = fixture.load('projects.json')[0]
 
spyOn(jQuery, 'ajax').and.callFake (req) =>
expect(req.url).toBe('/api/v3/projects.json?format=simple')
expect(req.url).toBe('/api/v3/projects.json?simple=true')
d = $.Deferred()
d.resolve @projects_data
d.promise()
Loading
Loading
Loading
Loading
@@ -81,6 +81,16 @@ describe API::API, api: true do
expect(json_response.first.keys).not_to include('open_issues_count')
end
 
context 'GET /projects?simple=true' do
let(:keys) { ["id", "http_url_to_repo", "web_url", "name", "name_with_namespace", "path", "path_with_namespace", "permissions"] }
it 'should return a simplified version of all the projects' do
get api('/projects?simple=true', user)
expect(response).to have_http_status(200)
expect(json_response).to be_an Array
expect(json_response.first.keys).to match_array keys
end
end
context 'and using search' do
it 'should return searched project' do
get api('/projects', user), { search: project.name }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment