diff options
| author | Natalia Tepluhina <tarya.se@gmail.com> | 2019-02-13 12:07:45 +0100 |
|---|---|---|
| committer | Natalia Tepluhina <tarya.se@gmail.com> | 2019-02-13 12:07:45 +0100 |
| commit | ecc56dda6fd985f954f6cec35c69bd2df4379ca9 (patch) | |
| tree | 7807f070cbd4672d9d84e6883535df3968f4df0a | |
| parent | af16fcb219b52a13373aa218e5fbb5ae69154015 (diff) | |
| download | gitlab-ce-ecc56dda6fd985f954f6cec35c69bd2df4379ca9.tar.gz | |
Fixed failing karma test
| -rw-r--r-- | app/assets/javascripts/diffs/store/utils.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/diffs/store/utils_spec.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 5a8a993dbd3..7dac134d4a2 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -404,7 +404,9 @@ export const getDiffMode = diffFile => { const diffModeKey = Object.keys(diffModes).find(key => diffFile[`${key}_file`]); return ( diffModes[diffModeKey] || - (diffFile.viewer.name === diffViewerModes.mode_changed && diffViewerModes.mode_changed) || + (diffFile.viewer && + diffFile.viewer.name === diffViewerModes.mode_changed && + diffViewerModes.mode_changed) || diffModes.replaced ); }; diff --git a/spec/javascripts/diffs/store/utils_spec.js b/spec/javascripts/diffs/store/utils_spec.js index c5e413a29d8..dd0b69491b8 100644 --- a/spec/javascripts/diffs/store/utils_spec.js +++ b/spec/javascripts/diffs/store/utils_spec.js @@ -587,7 +587,7 @@ describe('DiffsStoreUtils', () => { it('returns mode_changed if key has no match', () => { expect( utils.getDiffMode({ - mode_changed: true, + viewer: { name: 'mode_changed' }, }), ).toBe('mode_changed'); }); |