diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
| commit | 4c6898bdcf0bff6a0a3b288215271be4e916b27c (patch) | |
| tree | 13db382a777a55c8220fcbdd85ebf5bf4cedeb03 /spec/javascripts/api_spec.js | |
| parent | ae9b771797cceee76c18376910519e9e71628acc (diff) | |
| parent | 063e285e6a8c26a95809873fb32fefc54fe9bdb6 (diff) | |
| download | gitlab-ce-36860-migrate-issues-author.tar.gz | |
Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/javascripts/api_spec.js')
| -rw-r--r-- | spec/javascripts/api_spec.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/javascripts/api_spec.js b/spec/javascripts/api_spec.js index 8c68ceff914..2aa4fb1f6c6 100644 --- a/spec/javascripts/api_spec.js +++ b/spec/javascripts/api_spec.js @@ -101,12 +101,13 @@ describe('Api', () => { it('fetches projects with membership when logged in', (done) => { const query = 'dummy query'; const options = { unused: 'option' }; - const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json?simple=true`; + const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`; window.gon.current_user_id = 1; const expectedData = Object.assign({ search: query, per_page: 20, membership: true, + simple: true, }, options); spyOn(jQuery, 'ajax').and.callFake((request) => { expect(request.url).toEqual(expectedUrl); @@ -124,10 +125,11 @@ describe('Api', () => { it('fetches projects without membership when not logged in', (done) => { const query = 'dummy query'; const options = { unused: 'option' }; - const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json?simple=true`; + const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`; const expectedData = Object.assign({ search: query, per_page: 20, + simple: true, }, options); spyOn(jQuery, 'ajax').and.callFake((request) => { expect(request.url).toEqual(expectedUrl); |