From 6f5723a169b5d400c136dbd844fc54c68e5f8563 Mon Sep 17 00:00:00 2001 From: Johann Hubert Sonntagbauer Date: Tue, 9 Oct 2018 20:03:09 +0200 Subject: enable jasmine/new-line-before-expect --- spec/javascripts/ide/components/branches/item_spec.js | 2 ++ spec/javascripts/ide/components/commit_sidebar/message_field_spec.js | 2 ++ spec/javascripts/ide/components/ide_status_bar_spec.js | 2 ++ spec/javascripts/ide/components/merge_requests/item_spec.js | 1 + spec/javascripts/ide/components/new_dropdown/index_spec.js | 1 + spec/javascripts/ide/components/repo_editor_spec.js | 3 +++ spec/javascripts/ide/components/shared/tokened_input_spec.js | 2 ++ 7 files changed, 13 insertions(+) (limited to 'spec/javascripts/ide/components') diff --git a/spec/javascripts/ide/components/branches/item_spec.js b/spec/javascripts/ide/components/branches/item_spec.js index 8b756c8f168..249b80bbba6 100644 --- a/spec/javascripts/ide/components/branches/item_spec.js +++ b/spec/javascripts/ide/components/branches/item_spec.js @@ -29,6 +29,7 @@ describe('IDE branch item', () => { it('renders branch name and timeago', () => { const timeText = getTimeago().format(TEST_BRANCH.committedDate); + expect(vm.$el).toContainText(TEST_BRANCH.name); expect(vm.$el.querySelector('time')).toHaveText(timeText); expect(vm.$el.querySelector('.ic-mobile-issue-close')).toBe(null); @@ -36,6 +37,7 @@ describe('IDE branch item', () => { it('renders link to branch', () => { const expectedHref = router.resolve(`/project/${TEST_PROJECT_ID}/edit/${TEST_BRANCH.name}`).href; + expect(vm.$el).toMatch('a'); expect(vm.$el).toHaveAttr('href', expectedHref); }); diff --git a/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js b/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js index 942cc19f46d..c06dfa46303 100644 --- a/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js +++ b/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js @@ -76,6 +76,7 @@ describe('IDE commit message field', () => { expect(vm.$el.querySelector('.highlights span').textContent).toContain( 'text less than 50 chars', ); + expect(vm.$el.querySelector('mark').style.display).toBe('none'); }) .then(done) @@ -92,6 +93,7 @@ describe('IDE commit message field', () => { expect(vm.$el.querySelector('.highlights span').textContent).toContain( 'text less than 50 chars that should not highlighte', ); + expect(vm.$el.querySelector('mark').style.display).not.toBe('none'); expect(vm.$el.querySelector('mark').textContent).toBe( 'd. text more than 50 should be highlighted', diff --git a/spec/javascripts/ide/components/ide_status_bar_spec.js b/spec/javascripts/ide/components/ide_status_bar_spec.js index 47d6492a7a6..9874e7b597e 100644 --- a/spec/javascripts/ide/components/ide_status_bar_spec.js +++ b/spec/javascripts/ide/components/ide_status_bar_spec.js @@ -50,9 +50,11 @@ describe('ideStatusBar', () => { expect(vm.commitAgeUpdate).not.toHaveBeenCalled(); jasmine.clock().tick(1100); + expect(vm.commitAgeUpdate.calls.count()).toEqual(1); jasmine.clock().tick(1000); + expect(vm.commitAgeUpdate.calls.count()).toEqual(2); }); }); diff --git a/spec/javascripts/ide/components/merge_requests/item_spec.js b/spec/javascripts/ide/components/merge_requests/item_spec.js index 750948cae3c..c92e6b89c78 100644 --- a/spec/javascripts/ide/components/merge_requests/item_spec.js +++ b/spec/javascripts/ide/components/merge_requests/item_spec.js @@ -30,6 +30,7 @@ describe('IDE merge request item', () => { it('renders link with href', () => { const expectedHref = router.resolve(`/project/${vm.item.projectPathWithNamespace}/merge_requests/${vm.item.iid}`).href; + expect(vm.$el).toMatch('a'); expect(vm.$el).toHaveAttr('href', expectedHref); }); diff --git a/spec/javascripts/ide/components/new_dropdown/index_spec.js b/spec/javascripts/ide/components/new_dropdown/index_spec.js index 8a8cbd2cee4..83e530f0a6a 100644 --- a/spec/javascripts/ide/components/new_dropdown/index_spec.js +++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js @@ -36,6 +36,7 @@ describe('new dropdown component', () => { it('renders new file, upload and new directory links', () => { const buttons = vm.$el.querySelectorAll('.dropdown-menu button'); + expect(buttons[0].textContent.trim()).toBe('New file'); expect(buttons[1].textContent.trim()).toBe('Upload file'); expect(buttons[2].textContent.trim()).toBe('New directory'); diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js index 991fb750876..d9136d636d0 100644 --- a/spec/javascripts/ide/components/repo_editor_spec.js +++ b/spec/javascripts/ide/components/repo_editor_spec.js @@ -52,6 +52,7 @@ describe('RepoEditor', () => { it('renders only an edit tab', done => { Vue.nextTick(() => { const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li'); + expect(tabs.length).toBe(1); expect(tabs[0].textContent.trim()).toBe('Edit'); @@ -72,6 +73,7 @@ describe('RepoEditor', () => { it('renders an Edit and a Preview Tab', done => { Vue.nextTick(() => { const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li'); + expect(tabs.length).toBe(2); expect(tabs[0].textContent.trim()).toBe('Edit'); expect(tabs[1].textContent.trim()).toBe('Preview Markdown'); @@ -109,6 +111,7 @@ describe('RepoEditor', () => { it('renders an Edit and a Preview Tab', done => { Vue.nextTick(() => { const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li'); + expect(tabs.length).toBe(2); expect(tabs[0].textContent.trim()).toBe('Review'); expect(tabs[1].textContent.trim()).toBe('Preview Markdown'); diff --git a/spec/javascripts/ide/components/shared/tokened_input_spec.js b/spec/javascripts/ide/components/shared/tokened_input_spec.js index 09940fe8c6a..935ee0beea8 100644 --- a/spec/javascripts/ide/components/shared/tokened_input_spec.js +++ b/spec/javascripts/ide/components/shared/tokened_input_spec.js @@ -85,10 +85,12 @@ describe('IDE shared/TokenedInput', () => { vm.value = ''; vm.onBackspace(); + expect(vm.$emit).not.toHaveBeenCalled(); expect(vm.backspaceCount).toEqual(1); vm.onBackspace(); + expect(vm.$emit).toHaveBeenCalledWith('removeToken', TEST_TOKENS[TEST_TOKENS.length - 1]); expect(vm.backspaceCount).toEqual(0); }); -- cgit v1.2.1