diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 09:10:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 09:10:25 +0300 |
commit | a9c127515a36f928544b18ddd69e8b2dc6236aba (patch) | |
tree | d65cff099c6f7528f4d51daed34e958cc1c78793 /spec/frontend/diffs | |
parent | 3c988b99e6a6232f26a1e18c2c2d6304e30570f3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/diffs')
-rw-r--r-- | spec/frontend/diffs/components/compare_versions_spec.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/frontend/diffs/components/compare_versions_spec.js b/spec/frontend/diffs/components/compare_versions_spec.js index a01ec1db35c..80a51ee137a 100644 --- a/spec/frontend/diffs/components/compare_versions_spec.js +++ b/spec/frontend/diffs/components/compare_versions_spec.js @@ -19,8 +19,11 @@ describe('CompareVersions', () => { const targetBranchName = 'tmp-wine-dev'; const { commit } = getDiffWithCommit(); - const createWrapper = (props = {}, commitArgs = {}) => { - store.state.diffs.commit = { ...store.state.diffs.commit, ...commitArgs }; + const createWrapper = (props = {}, commitArgs = {}, createCommit = true) => { + if (createCommit) { + store.state.diffs.commit = { ...store.state.diffs.commit, ...commitArgs }; + } + wrapper = mount(CompareVersionsComponent, { localVue, store, @@ -59,7 +62,7 @@ describe('CompareVersions', () => { describe('template', () => { beforeEach(() => { - createWrapper(); + createWrapper({}, {}, false); }); it('should render Tree List toggle button with correct attribute values', () => { |