diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-11 10:17:39 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-11 10:17:39 +0000 |
commit | 423f82d41125ef2a6bfafb0d963dafd52ba656db (patch) | |
tree | 2d14c9153f1b06d16f37c427c511f2906ed8c1ef /spec/frontend | |
parent | 51119395e668d592d69266cf74dcb67b667082a8 (diff) | |
parent | 1d04ae7458bec082a2f82d0776f89e297719f23c (diff) | |
download | gitlab-ce-423f82d41125ef2a6bfafb0d963dafd52ba656db.tar.gz |
Merge branch 'fixed-web-ide-merge-request-review' into 'master'
Fixes Web IDE not loading merge request files
Closes #60243
See merge request gitlab-org/gitlab-ce!27225
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/ide/stores/mutations/merge_request_spec.js | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/frontend/ide/stores/mutations/merge_request_spec.js b/spec/frontend/ide/stores/mutations/merge_request_spec.js index e30ca22022f..afbe6770c0d 100644 --- a/spec/frontend/ide/stores/mutations/merge_request_spec.js +++ b/spec/frontend/ide/stores/mutations/merge_request_spec.js @@ -32,6 +32,24 @@ describe('IDE store merge request mutations', () => { expect(newMr.title).toBe('mr'); expect(newMr.active).toBeTruthy(); }); + + it('keeps original data', () => { + const versions = ['change']; + const mergeRequest = localState.projects.abcproject.mergeRequests[1]; + + mergeRequest.versions = versions; + + mutations.SET_MERGE_REQUEST(localState, { + projectPath: 'abcproject', + mergeRequestId: 1, + mergeRequest: { + title: ['change'], + }, + }); + + expect(mergeRequest.title).toBe('mr'); + expect(mergeRequest.versions).toEqual(versions); + }); }); describe('SET_MERGE_REQUEST_CHANGES', () => { |