summaryrefslogtreecommitdiff
path: root/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/diffs/components/parallel_diff_table_row_spec.js')
-rw-r--r--spec/frontend/diffs/components/parallel_diff_table_row_spec.js26
1 files changed, 7 insertions, 19 deletions
diff --git a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
index 13c4ce06f18..13031bd8b66 100644
--- a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
+++ b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
@@ -1,7 +1,6 @@
import Vue from 'vue';
import { shallowMount } from '@vue/test-utils';
import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
-import { TEST_HOST } from 'helpers/test_constants';
import { createStore } from '~/mr_notes/stores';
import ParallelDiffTableRow from '~/diffs/components/parallel_diff_table_row.vue';
import diffFileMockData from '../mock_data/diff_file';
@@ -186,13 +185,6 @@ describe('ParallelDiffTableRow', () => {
});
};
- const setWindowLocation = value => {
- Object.defineProperty(window, 'location', {
- writable: true,
- value,
- });
- };
-
beforeEach(() => {
// eslint-disable-next-line prefer-destructuring
thisLine = diffFileMockData.parallel_diff_lines[2];
@@ -228,19 +220,15 @@ describe('ParallelDiffTableRow', () => {
const findNoteButton = () => wrapper.find({ ref: 'addDiffNoteButtonLeft' });
it.each`
- hover | line | userData | query | mergeRefHeadComments | expectation
- ${true} | ${{}} | ${TEST_USER} | ${'diff_head=false'} | ${false} | ${true}
- ${true} | ${{ line: { left: null } }} | ${TEST_USER} | ${'diff_head=false'} | ${false} | ${false}
- ${true} | ${{}} | ${TEST_USER} | ${'diff_head=true'} | ${true} | ${true}
- ${true} | ${{}} | ${TEST_USER} | ${'diff_head=true'} | ${false} | ${false}
- ${true} | ${{}} | ${null} | ${''} | ${true} | ${false}
- ${false} | ${{}} | ${TEST_USER} | ${'diff_head=false'} | ${false} | ${false}
+ hover | line | userData | expectation
+ ${true} | ${{}} | ${TEST_USER} | ${true}
+ ${true} | ${{ line: { left: null } }} | ${TEST_USER} | ${false}
+ ${true} | ${{}} | ${null} | ${false}
+ ${false} | ${{}} | ${TEST_USER} | ${false}
`(
- 'exists is $expectation - with userData ($userData) query ($query)',
- async ({ hover, line, userData, query, mergeRefHeadComments, expectation }) => {
+ 'exists is $expectation - with userData ($userData)',
+ async ({ hover, line, userData, expectation }) => {
store.state.notes.userData = userData;
- gon.features = { mergeRefHeadComments };
- setWindowLocation({ href: `${TEST_HOST}?${query}` });
createComponent(line, store);
if (hover) await wrapper.find('.line_holder').trigger('mouseover');