diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-12-05 12:11:31 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-12-05 12:11:31 +0300 |
| commit | 2cd710732e6b2b6d31b4fd01a6d065c33db066b3 (patch) | |
| tree | 5845c14f72e8428110416cdee0ef982ce83bb875 /spec/javascripts | |
| parent | 00acef434031b5dc0bf39576a9e83802c7806842 (diff) | |
| parent | 9afc3069b00d0f9beee3e838e134d7939823aa1f (diff) | |
Merge branch 'expand-diff-bug' into 'master'
Fixed diff files not expanding
Closes #54868
See merge request gitlab-org/gitlab-ce!23555
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/diffs/store/actions_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/diffs/store/actions_spec.js b/spec/javascripts/diffs/store/actions_spec.js index 205138bd845..5656ce16db0 100644 --- a/spec/javascripts/diffs/store/actions_spec.js +++ b/spec/javascripts/diffs/store/actions_spec.js @@ -379,7 +379,7 @@ describe('DiffsStoreActions', () => { describe('loadCollapsedDiff', () => { it('should fetch data and call mutation with response and the give parameter', done => { - const file = { hash: 123, loadCollapsedDiffUrl: '/load/collapsed/diff/url' }; + const file = { hash: 123, load_collapsed_diff_url: '/load/collapsed/diff/url' }; const data = { hash: 123, parallelDiffLines: [{ lineCode: 1 }] }; const mock = new MockAdapter(axios); mock.onGet(file.loadCollapsedDiffUrl).reply(200, data); |