diff options
author | Simon Knox <psimyn@gmail.com> | 2018-01-16 19:32:36 +1100 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2018-01-16 19:32:36 +1100 |
commit | aab4ca36c7d1c797a0d661891b0e15f4a80a87ad (patch) | |
tree | 793c8eb5c7a8871d7dfefa70325e6c5068ee7eba | |
parent | 28807cf4806dc0048c4fa033c3caf6f468515c52 (diff) | |
download | gitlab-ce-psimyn-diff-discussion-vue.tar.gz |
fix tests - update selector for copy buttonpsimyn-diff-discussion-vue
-rw-r--r-- | spec/javascripts/notes/components/diff_file_header_spec.js | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/spec/javascripts/notes/components/diff_file_header_spec.js b/spec/javascripts/notes/components/diff_file_header_spec.js index 06c3772be8c..f8e968c5801 100644 --- a/spec/javascripts/notes/components/diff_file_header_spec.js +++ b/spec/javascripts/notes/components/diff_file_header_spec.js @@ -5,7 +5,7 @@ import mountComponent from '../../helpers/vue_mount_component_helper'; const discussionFixture = 'merge_requests/diff_discussion.json'; -fdescribe('diff_file_header', () => { +describe('diff_file_header', () => { let vm; const diffDiscussionMock = getJSONFixture(discussionFixture)[0]; const diffFile = camelCaseKeys(diffDiscussionMock.diff_file); @@ -15,7 +15,7 @@ fdescribe('diff_file_header', () => { const Component = Vue.extend(DiffFileHeader); const selectors = { get copyButton() { - return vm.$el.querySelector('button[data-title="Copy file path to clipboard"]'); + return vm.$el.querySelector('button[data-original-title="Copy file path to clipboard"]'); }, get fileName() { return vm.$el.querySelector('.file-title-name'); @@ -47,17 +47,15 @@ fdescribe('diff_file_header', () => { beforeEach(() => { props.diffFile.submodule = false; props.diffFile.discussionPath = 'some/discussion/id'; - }); - it('shows file type icon', () => { vm = mountComponent(Component, props); + }); + it('shows file type icon', () => { expect(vm.$el.innerHTML).toContain('fa-file-text-o'); }); it('links to discussion path', () => { - vm = mountComponent(Component, props); - expect(selectors.titleWrapper).toExist(); expect(selectors.titleWrapper.tagName).toBe('A'); expect(selectors.titleWrapper.getAttribute('href')).toBe(props.diffFile.discussionPath); @@ -65,7 +63,6 @@ fdescribe('diff_file_header', () => { it('shows plain title if no link given', () => { props.diffFile.discussionPath = undefined; - vm = mountComponent(Component, props); expect(selectors.titleWrapper.tagName).not.toBe('A'); @@ -77,18 +74,20 @@ fdescribe('diff_file_header', () => { expect(selectors.copyButton.getAttribute('data-clipboard-text')).toBe(props.diffFile.filePath); }); - it('shows file mode change', () => { - props.diffFile = { + it('shows file mode change', (done) => { + vm.diffFile = { ...props.diffFile, modeChanged: true, aMode: '100755', bMode: '100644', }; - vm = mountComponent(Component, props); - expect( - vm.$refs.fileMode.textContent.trim(), - ).toBe('100755 → 100644'); + Vue.nextTick(() => { + expect( + vm.$refs.fileMode.textContent.trim(), + ).toBe('100755 → 100644'); + done(); + }); }); }); }); |