diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 12:07:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 12:07:48 +0300 |
commit | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (patch) | |
tree | 3721386728719a7779d1cd627281e9a28cc40c4a /spec/javascripts/diffs | |
parent | 8e22ef10e4f9c6d1ef2411aa26ddd0658e2f1461 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/diffs')
-rw-r--r-- | spec/javascripts/diffs/components/app_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/diffs/store/actions_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/diffs/store/mutations_spec.js | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/spec/javascripts/diffs/components/app_spec.js b/spec/javascripts/diffs/components/app_spec.js index dbeff7284ce..b21cab58b4e 100644 --- a/spec/javascripts/diffs/components/app_spec.js +++ b/spec/javascripts/diffs/components/app_spec.js @@ -41,6 +41,7 @@ describe('diffs/components/app', () => { changesEmptyStateIllustration: '', dismissEndpoint: '', showSuggestPopover: true, + useSingleDiffStyle: false, ...props, }, store, diff --git a/spec/javascripts/diffs/store/actions_spec.js b/spec/javascripts/diffs/store/actions_spec.js index 95fd43367e5..163d530a2b6 100644 --- a/spec/javascripts/diffs/store/actions_spec.js +++ b/spec/javascripts/diffs/store/actions_spec.js @@ -75,6 +75,7 @@ describe('DiffsStoreActions', () => { const projectPath = '/root/project'; const dismissEndpoint = '/-/user_callouts'; const showSuggestPopover = false; + const useSingleDiffStyle = false; testAction( setBaseConfig, @@ -85,6 +86,7 @@ describe('DiffsStoreActions', () => { projectPath, dismissEndpoint, showSuggestPopover, + useSingleDiffStyle, }, { endpoint: '', @@ -93,6 +95,7 @@ describe('DiffsStoreActions', () => { projectPath: '', dismissEndpoint: '', showSuggestPopover: true, + useSingleDiffStyle: true, }, [ { @@ -104,6 +107,7 @@ describe('DiffsStoreActions', () => { projectPath, dismissEndpoint, showSuggestPopover, + useSingleDiffStyle, }, }, ], diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js index 19bf5bdd592..13f16e4f9a6 100644 --- a/spec/javascripts/diffs/store/mutations_spec.js +++ b/spec/javascripts/diffs/store/mutations_spec.js @@ -10,11 +10,13 @@ describe('DiffsStoreMutations', () => { const state = {}; const endpoint = '/diffs/endpoint'; const projectPath = '/root/project'; + const useSingleDiffStyle = false; - mutations[types.SET_BASE_CONFIG](state, { endpoint, projectPath }); + mutations[types.SET_BASE_CONFIG](state, { endpoint, projectPath, useSingleDiffStyle }); expect(state.endpoint).toEqual(endpoint); expect(state.projectPath).toEqual(projectPath); + expect(state.useSingleDiffStyle).toEqual(useSingleDiffStyle); }); }); |