Commit ffbfd18c authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'ide-edit-json-files' into 'master'

Fixed IDE not opening JSON files

See merge request gitlab-org/gitlab-ce!20798
parents 4fd6b5bc 832dcd6c
Pipeline #26538453 passed with stages
in 35 minutes and 20 seconds
......@@ -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);
},
......
---
title: Fixed IDE not opening JSON files
merge_request: 20798
author:
type: fixed
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment