diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-26 08:34:05 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-26 08:34:05 +0000 |
| commit | ffbfd18ce2fabb886121f4e53f714f0ad9b44121 (patch) | |
| tree | 59dd0921be66dcb4b261a9017ac19089618336f8 | |
| parent | 4fd6b5bc663bcaf1c4f0c9efac12e7110f7a912f (diff) | |
| parent | 832dcd6c90a1ca55d8eacd50ba56916e8923b76e (diff) | |
| download | gitlab-ce-ffbfd18ce2fabb886121f4e53f714f0ad9b44121.tar.gz | |
Merge branch 'ide-edit-json-files' into 'master'
Fixed IDE not opening JSON files
See merge request gitlab-org/gitlab-ce!20798
| -rw-r--r-- | app/assets/javascripts/ide/services/index.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/ide-edit-json-files.yml | 5 | ||||
| -rw-r--r-- | spec/javascripts/ide/stores/actions/file_spec.js | 17 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js index 49a481f25d5..cb93fba1665 100644 --- a/app/assets/javascripts/ide/services/index.js +++ b/app/assets/javascripts/ide/services/index.js @@ -18,7 +18,7 @@ export default { return axios .get(file.rawPath, { - params: { format: 'json' }, + transformResponse: [f => f], }) .then(({ data }) => data); }, @@ -33,7 +33,7 @@ export default { return axios .get(file.rawPath.replace(`/raw/${file.branchId}/${file.path}`, `/raw/${sha}/${file.path}`), { - params: { format: 'json' }, + transformResponse: [f => f], }) .then(({ data }) => data); }, diff --git a/changelogs/unreleased/ide-edit-json-files.yml b/changelogs/unreleased/ide-edit-json-files.yml new file mode 100644 index 00000000000..2a6e6b80de1 --- /dev/null +++ b/changelogs/unreleased/ide-edit-json-files.yml @@ -0,0 +1,5 @@ +--- +title: Fixed IDE not opening JSON files +merge_request: 20798 +author: +type: fixed diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js index f570c0b16bd..72eb20bdc87 100644 --- a/spec/javascripts/ide/stores/actions/file_spec.js +++ b/spec/javascripts/ide/stores/actions/file_spec.js @@ -366,6 +366,23 @@ describe('IDE store file actions', () => { }); }); + describe('return JSON', () => { + beforeEach(() => { + mock.onGet(/(.*)/).replyOnce(200, JSON.stringify({ test: '123' })); + }); + + it('does not parse returned JSON', done => { + store + .dispatch('getRawFileData', { path: tmpFile.path }) + .then(() => { + expect(tmpFile.raw).toEqual('{"test":"123"}'); + + done(); + }) + .catch(done.fail); + }); + }); + describe('error', () => { beforeEach(() => { mock.onGet(/(.*)/).networkError(); |