diff options
| author | Johann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com> | 2018-10-09 20:03:09 +0200 |
|---|---|---|
| committer | Johann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com> | 2018-10-17 06:57:29 +0200 |
| commit | 6f5723a169b5d400c136dbd844fc54c68e5f8563 (patch) | |
| tree | e7bad2648366ed5943293655a0abe23367e869a6 /spec/javascripts/diffs | |
| parent | 28d412e5b2b8499fba22e8fabb1d44f44449228e (diff) | |
| download | gitlab-ce-6f5723a169b5d400c136dbd844fc54c68e5f8563.tar.gz | |
enable jasmine/new-line-before-expect
Diffstat (limited to 'spec/javascripts/diffs')
8 files changed, 39 insertions, 0 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_header_spec.js b/spec/javascripts/diffs/components/diff_file_header_spec.js index 1f7d5f42322..2fd92c6f5b6 100644 --- a/spec/javascripts/diffs/components/diff_file_header_spec.js +++ b/spec/javascripts/diffs/components/diff_file_header_spec.js @@ -98,6 +98,7 @@ describe('diff_file_header', () => { props.discussionPath = 'link://to/discussion'; vm = mountComponentWithStore(Component, { props, store }); const href = vm.$el.querySelector('.js-title-wrapper').getAttribute('href'); + expect(href).toBe(vm.discussionPath); }); }); @@ -270,6 +271,7 @@ describe('diff_file_header', () => { it('displays an file icon in the title', () => { vm = mountComponentWithStore(Component, { props, store }); + expect(vm.$el.querySelector('svg.js-file-icon use').getAttribute('xlink:href')).toContain( 'ruby', ); @@ -312,6 +314,7 @@ describe('diff_file_header', () => { vm = mountComponentWithStore(Component, { props, store }); const button = vm.$el.querySelector('.btn-clipboard'); + expect(button).not.toBe(null); expect(button.dataset.clipboardText).toBe('{"text":"files/ruby/popen.rb","gfm":"`files/ruby/popen.rb`"}'); }); @@ -323,6 +326,7 @@ describe('diff_file_header', () => { vm = mountComponentWithStore(Component, { props, store }); const { fileMode } = vm.$refs; + expect(fileMode).not.toBe(undefined); expect(fileMode).toContainText(props.diffFile.aMode); expect(fileMode).toContainText(props.diffFile.bMode); @@ -334,6 +338,7 @@ describe('diff_file_header', () => { vm = mountComponentWithStore(Component, { props, store }); const { fileMode } = vm.$refs; + expect(fileMode).toBe(undefined); }); }); diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js index b8d4b31ee04..f009ef89d88 100644 --- a/spec/javascripts/diffs/components/diff_file_spec.js +++ b/spec/javascripts/diffs/components/diff_file_spec.js @@ -97,6 +97,7 @@ describe('DiffFile', () => { expect(vm.$el.innerText).toContain( 'This source diff could not be displayed because it is too large', ); + expect(vm.$el.querySelector('.js-too-large-diff')).toBeDefined(); expect(vm.$el.querySelector('.js-too-large-diff a').href.indexOf(BLOB_LINK)).toBeGreaterThan(-1); diff --git a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js index 0085a16815a..ad2605a5c5c 100644 --- a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js +++ b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js @@ -23,6 +23,7 @@ describe('DiffGutterAvatars', () => { it('should return false when all discussions are not expanded', () => { component.discussions[0].expanded = false; + expect(component.discussionsExpanded).toEqual(false); }); }); @@ -56,6 +57,7 @@ describe('DiffGutterAvatars', () => { it('should return empty string if there is no discussion', () => { component.discussions = []; + expect(component.moreText).toEqual(''); }); }); diff --git a/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js b/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js index f36454cc23e..6972e0ee913 100644 --- a/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js +++ b/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js @@ -31,12 +31,14 @@ describe('DiffLineGutterContent', () => { it('should prepend # to lineCode', () => { const lineCode = 'LC_42'; const component = createComponent(); + expect(component.lineHref).toEqual(`#${lineCode}`); }); it('should return # if there is no lineCode', () => { const component = createComponent(); component.line.lineCode = ''; + expect(component.lineHref).toEqual('#'); }); }); @@ -44,6 +46,7 @@ describe('DiffLineGutterContent', () => { describe('discussions, hasDiscussions, shouldShowAvatarsOnGutter', () => { it('should return empty array when there is no discussion', () => { const component = createComponent(); + expect(component.hasDiscussions).toEqual(false); expect(component.shouldShowAvatarsOnGutter).toEqual(false); }); diff --git a/spec/javascripts/diffs/components/diff_line_note_form_spec.js b/spec/javascripts/diffs/components/diff_line_note_form_spec.js index f31fc1f0e2b..c39b54d9cc9 100644 --- a/spec/javascripts/diffs/components/diff_line_note_form_spec.js +++ b/spec/javascripts/diffs/components/diff_line_note_form_spec.js @@ -36,6 +36,7 @@ describe('DiffLineNoteForm', () => { spyOn(window, 'confirm').and.returnValue(false); component.handleCancelCommentForm(true, true); + expect(window.confirm).toHaveBeenCalled(); }); @@ -43,9 +44,11 @@ describe('DiffLineNoteForm', () => { spyOn(window, 'confirm').and.returnValue(false); component.handleCancelCommentForm(true, false); + expect(window.confirm).not.toHaveBeenCalled(); component.handleCancelCommentForm(false, true); + expect(window.confirm).not.toHaveBeenCalled(); }); @@ -60,6 +63,7 @@ describe('DiffLineNoteForm', () => { expect(component.cancelCommentForm).toHaveBeenCalledWith({ lineCode: diffLines[0].lineCode, }); + expect(component.resetAutoSave).toHaveBeenCalled(); done(); diff --git a/spec/javascripts/diffs/store/getters_spec.js b/spec/javascripts/diffs/store/getters_spec.js index cfeaaec6980..807a9e3baf0 100644 --- a/spec/javascripts/diffs/store/getters_spec.js +++ b/spec/javascripts/diffs/store/getters_spec.js @@ -52,11 +52,13 @@ describe('Diffs Module Getters', () => { describe('areAllFilesCollapsed', () => { it('returns true when all files are collapsed', () => { localState.diffFiles = [{ collapsed: true }, { collapsed: true }]; + expect(getters.areAllFilesCollapsed(localState)).toEqual(true); }); it('returns false when at least one file is not collapsed', () => { localState.diffFiles = [{ collapsed: false }, { collapsed: true }]; + expect(getters.areAllFilesCollapsed(localState)).toEqual(false); }); }); @@ -244,6 +246,7 @@ describe('Diffs Module Getters', () => { it('returns false when no line discussions were found', () => { line.discussions = []; + expect(getters.shouldRenderInlineCommentRow(localState)(line)).toEqual(false); }); @@ -288,6 +291,7 @@ describe('Diffs Module Getters', () => { it('returns null if no matching file is found', () => { localState.diffFiles = []; + expect(getters.getDiffFileByHash(localState)('123')).toBeUndefined(); }); }); diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js index 0b712055956..b7e28391419 100644 --- a/spec/javascripts/diffs/store/mutations_spec.js +++ b/spec/javascripts/diffs/store/mutations_spec.js @@ -12,6 +12,7 @@ describe('DiffsStoreMutations', () => { const projectPath = '/root/project'; mutations[types.SET_BASE_CONFIG](state, { endpoint, projectPath }); + expect(state.endpoint).toEqual(endpoint); expect(state.projectPath).toEqual(projectPath); }); @@ -22,6 +23,7 @@ describe('DiffsStoreMutations', () => { const state = {}; mutations[types.SET_LOADING](state, false); + expect(state.isLoading).toEqual(false); }); }); @@ -48,6 +50,7 @@ describe('DiffsStoreMutations', () => { const state = {}; mutations[types.SET_DIFF_VIEW_TYPE](state, INLINE_DIFF_VIEW_TYPE); + expect(state.diffViewType).toEqual(INLINE_DIFF_VIEW_TYPE); }); }); @@ -58,6 +61,7 @@ describe('DiffsStoreMutations', () => { const lineCode = 'FDE'; mutations[types.ADD_COMMENT_FORM_LINE](state, { lineCode }); + expect(state.diffLineCommentForms[lineCode]).toBeTruthy(); }); }); @@ -68,9 +72,11 @@ describe('DiffsStoreMutations', () => { const lineCode = 'FDE'; mutations[types.ADD_COMMENT_FORM_LINE](state, { lineCode }); + expect(state.diffLineCommentForms[lineCode]).toBeTruthy(); mutations[types.REMOVE_COMMENT_FORM_LINE](state, { lineCode }); + expect(state.diffLineCommentForms[lineCode]).toBeUndefined(); }); }); @@ -83,6 +89,7 @@ describe('DiffsStoreMutations', () => { const state = { expandAllFiles: true, diffFiles: [diffFile] }; mutations[types.EXPAND_ALL_FILES](state); + expect(state.diffFiles[0].collapsed).toEqual(false); }); }); @@ -118,11 +125,13 @@ describe('DiffsStoreMutations', () => { options.lineNumbers, options.params.bottom, ); + expect(lineRefSpy).toHaveBeenCalledWith( options.contextLines, options.lineNumbers, options.params.bottom, ); + expect(addContextLinesSpy).toHaveBeenCalledWith({ inlineLines: diffFile.highlightedDiffLines, parallelLines: diffFile.parallelDiffLines, @@ -142,6 +151,7 @@ describe('DiffsStoreMutations', () => { const data = { diff_files: [{ file_hash: fileHash, extra_field: 1, existingField: 1 }] }; mutations[types.ADD_COLLAPSED_DIFFS](state, { file: state.diffFiles[1], data }); + expect(spy).toHaveBeenCalledWith(data, { deep: true }); expect(state.diffFiles[1].fileHash).toEqual(fileHash); @@ -345,6 +355,7 @@ describe('DiffsStoreMutations', () => { fileHash: 'ABC', lineCode: 'ABC_1', }); + expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(0); expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(0); }); diff --git a/spec/javascripts/diffs/store/utils_spec.js b/spec/javascripts/diffs/store/utils_spec.js index 257270a91ec..ef367fc09fa 100644 --- a/spec/javascripts/diffs/store/utils_spec.js +++ b/spec/javascripts/diffs/store/utils_spec.js @@ -62,10 +62,12 @@ describe('DiffsStoreUtils', () => { const atParallelIndex = diffFile.parallelDiffLines[parallelIndex]; utils.removeMatchLine(diffFile, lineNumbers, false); + expect(diffFile.highlightedDiffLines[inlineIndex]).not.toEqual(atInlineIndex); expect(diffFile.parallelDiffLines[parallelIndex]).not.toEqual(atParallelIndex); utils.removeMatchLine(diffFile, lineNumbers, true); + expect(diffFile.highlightedDiffLines[inlineIndex + 1]).not.toEqual(atInlineIndex); expect(diffFile.parallelDiffLines[parallelIndex + 1]).not.toEqual(atParallelIndex); }); @@ -87,11 +89,13 @@ describe('DiffsStoreUtils', () => { }; utils.addContextLines(options); + expect(inlineLines[inlineLines.length - 1]).toEqual(contextLines[0]); expect(parallelLines[parallelLines.length - 1]).toEqual(normalizedParallelLine); delete options.bottom; utils.addContextLines(options); + expect(inlineLines[inlineIndex]).toEqual(contextLines[0]); expect(parallelLines[parallelIndex]).toEqual(normalizedParallelLine); }); @@ -274,6 +278,7 @@ describe('DiffsStoreUtils', () => { }; utils.trimFirstCharOfLineContent(lineObj); + expect(lineObj).toEqual({ discussions: [], richText: ' diff' }); }); @@ -288,19 +293,23 @@ describe('DiffsStoreUtils', () => { utils.prepareDiffData(preparedDiff); const firstParallelDiffLine = preparedDiff.diffFiles[0].parallelDiffLines[2]; + expect(firstParallelDiffLine.left.discussions.length).toBe(0); expect(firstParallelDiffLine.left).not.toHaveAttr('text'); expect(firstParallelDiffLine.right.discussions.length).toBe(0); expect(firstParallelDiffLine.right).not.toHaveAttr('text'); const firstParallelChar = firstParallelDiffLine.right.richText.charAt(0); + expect(firstParallelChar).not.toBe(' '); expect(firstParallelChar).not.toBe('+'); expect(firstParallelChar).not.toBe('-'); const checkLine = preparedDiff.diffFiles[0].highlightedDiffLines[0]; + expect(checkLine.discussions.length).toBe(0); expect(checkLine).not.toHaveAttr('text'); const firstChar = checkLine.richText.charAt(0); + expect(firstChar).not.toBe(' '); expect(firstChar).not.toBe('+'); expect(firstChar).not.toBe('-'); |
