summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-07-13 18:06:11 +0000
committerDouwe Maan <douwe@gitlab.com>2016-07-13 18:06:11 +0000
commitb8f67b4ddf6b4a56fc25565d66230fc6e78ba72d (patch)
tree882af00a70d099a617c8f9acefb048351b32c9ee /spec
parentd2c9e8ab6e696f9b2dd3abcddd7cb526e8057a14 (diff)
parent228073986bfb900ef324379639e1c5cce6b74fe6 (diff)
downloadgitlab-ce-b8f67b4ddf6b4a56fc25565d66230fc6e78ba72d.tar.gz
Merge branch 'dropdown-load-fix' into 'master'
Dropdown loading time preformance fix ## What does this MR do? Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object This MR aims to fix #17474 See merge request !5113
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/project_title_spec.js.coffee2
-rw-r--r--spec/requests/api/projects_spec.rb12
2 files changed, 13 insertions, 1 deletions
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee
index f0d26fb5446..0244119fa0e 100644
--- a/spec/javascripts/project_title_spec.js.coffee
+++ b/spec/javascripts/project_title_spec.js.coffee
@@ -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')
+ expect(req.url).toBe('/api/v3/projects.json?simple=true')
d = $.Deferred()
d.resolve @projects_data
d.promise()
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 8a52725a893..152cd802839 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -81,6 +81,18 @@ describe API::API, api: true do
expect(json_response.first.keys).not_to include('open_issues_count')
end
+ context 'GET /projects?simple=true' do
+ it 'returns a simplified version of all the projects' do
+ expected_keys = ["id", "http_url_to_repo", "web_url", "name", "name_with_namespace", "path", "path_with_namespace"]
+
+ 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 expected_keys
+ end
+ end
+
context 'and using search' do
it 'should return searched project' do
get api('/projects', user), { search: project.name }