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/sidebar | |
parent | 28d412e5b2b8499fba22e8fabb1d44f44449228e (diff) | |
download | gitlab-ce-6f5723a169b5d400c136dbd844fc54c68e5f8563.tar.gz |
enable jasmine/new-line-before-expect
Diffstat (limited to 'spec/javascripts/sidebar')
-rw-r--r-- | spec/javascripts/sidebar/assignees_spec.js | 10 | ||||
-rw-r--r-- | spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/sidebar/participants_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/sidebar/sidebar_assignees_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/sidebar/sidebar_store_spec.js | 7 | ||||
-rw-r--r-- | spec/javascripts/sidebar/subscriptions_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/sidebar/todo_spec.js | 5 |
7 files changed, 28 insertions, 0 deletions
diff --git a/spec/javascripts/sidebar/assignees_spec.js b/spec/javascripts/sidebar/assignees_spec.js index 843e7002180..e7f8f4f9936 100644 --- a/spec/javascripts/sidebar/assignees_spec.js +++ b/spec/javascripts/sidebar/assignees_spec.js @@ -22,6 +22,7 @@ describe('Assignee component', () => { }).$mount(); const collapsed = component.$el.querySelector('.sidebar-collapsed-icon'); + expect(collapsed.childElementCount).toEqual(1); expect(collapsed.children[0].getAttribute('aria-label')).toEqual('No Assignee'); expect(collapsed.children[0].classList.contains('fa')).toEqual(true); @@ -67,6 +68,7 @@ describe('Assignee component', () => { spyOn(component, '$emit'); component.$el.querySelector('.assign-yourself .btn-link').click(); + expect(component.$emit).toHaveBeenCalledWith('assign-self'); }); }); @@ -85,6 +87,7 @@ describe('Assignee component', () => { const collapsed = component.$el.querySelector('.sidebar-collapsed-icon'); const assignee = collapsed.children[0]; + expect(collapsed.childElementCount).toEqual(1); expect(assignee.querySelector('.avatar').getAttribute('src')).toEqual(UsersMock.user.avatar); expect(assignee.querySelector('.avatar').getAttribute('alt')).toEqual(`${UsersMock.user.name}'s avatar`); @@ -138,14 +141,17 @@ describe('Assignee component', () => { }).$mount(); const collapsed = component.$el.querySelector('.sidebar-collapsed-icon'); + expect(collapsed.childElementCount).toEqual(2); const first = collapsed.children[0]; + expect(first.querySelector('.avatar').getAttribute('src')).toEqual(users[0].avatar); expect(first.querySelector('.avatar').getAttribute('alt')).toEqual(`${users[0].name}'s avatar`); expect(first.querySelector('.author').innerText.trim()).toEqual(users[0].name); const second = collapsed.children[1]; + expect(second.querySelector('.avatar').getAttribute('src')).toEqual(users[1].avatar); expect(second.querySelector('.avatar').getAttribute('alt')).toEqual(`${users[1].name}'s avatar`); expect(second.querySelector('.author').innerText.trim()).toEqual(users[1].name); @@ -162,14 +168,17 @@ describe('Assignee component', () => { }).$mount(); const collapsed = component.$el.querySelector('.sidebar-collapsed-icon'); + expect(collapsed.childElementCount).toEqual(2); const first = collapsed.children[0]; + expect(first.querySelector('.avatar').getAttribute('src')).toEqual(users[0].avatar); expect(first.querySelector('.avatar').getAttribute('alt')).toEqual(`${users[0].name}'s avatar`); expect(first.querySelector('.author').innerText.trim()).toEqual(users[0].name); const second = collapsed.children[1]; + expect(second.querySelector('.avatar-counter').innerText.trim()).toEqual('+2'); }); @@ -200,6 +209,7 @@ describe('Assignee component', () => { expect(component.$el.querySelectorAll('.user-item').length).toEqual(component.defaultRenderCount); expect(component.$el.querySelector('.user-list-more')).not.toBe(null); const usersLabelExpectation = users.length - component.defaultRenderCount; + expect(component.$el.querySelector('.user-list-more .btn-link').innerText.trim()) .not.toBe(`+${usersLabelExpectation} more`); component.toggleShowLess(); diff --git a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js index 0e30759c41d..b4aeef182a6 100644 --- a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js +++ b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js @@ -88,6 +88,7 @@ describe('Issuable Time Tracker', () => { Vue.nextTick(() => { expect(vm.showComparisonState).toBe(true); const $comparisonPane = vm.$el.querySelector('.time-tracking-comparison-pane'); + expect($comparisonPane).toBeVisible(); done(); }); diff --git a/spec/javascripts/sidebar/participants_spec.js b/spec/javascripts/sidebar/participants_spec.js index e796ddee62f..54b9f30ad93 100644 --- a/spec/javascripts/sidebar/participants_spec.js +++ b/spec/javascripts/sidebar/participants_spec.js @@ -182,6 +182,7 @@ describe('Participants', function () { const participantsIconEl = vm.$el.querySelector('.sidebar-collapsed-icon'); participantsIconEl.click(); + expect(vm.$emit).toHaveBeenCalledWith('toggleSidebar'); }); }); diff --git a/spec/javascripts/sidebar/sidebar_assignees_spec.js b/spec/javascripts/sidebar/sidebar_assignees_spec.js index ebaaa6e806b..50e86781393 100644 --- a/spec/javascripts/sidebar/sidebar_assignees_spec.js +++ b/spec/javascripts/sidebar/sidebar_assignees_spec.js @@ -39,6 +39,7 @@ describe('sidebar assignees', () => { it('calls the mediator when saves the assignees', () => { vm.saveAssignees(); + expect(mediator.saveAssignees).toHaveBeenCalled(); }); @@ -51,6 +52,7 @@ describe('sidebar assignees', () => { it('hides assignees until fetched', (done) => { const currentAssignee = sidebarAssigneesEl.querySelector('.value'); + expect(currentAssignee).toBe(null); vm.store.isFetching.assignees = false; diff --git a/spec/javascripts/sidebar/sidebar_store_spec.js b/spec/javascripts/sidebar/sidebar_store_spec.js index 08b112a54ba..7ba62a59d58 100644 --- a/spec/javascripts/sidebar/sidebar_store_spec.js +++ b/spec/javascripts/sidebar/sidebar_store_spec.js @@ -56,11 +56,13 @@ describe('Sidebar store', function () { it('adds a new assignee', () => { this.store.addAssignee(ASSIGNEE); + expect(this.store.assignees.length).toEqual(1); }); it('removes an assignee', () => { this.store.removeAssignee(ASSIGNEE); + expect(this.store.assignees.length).toEqual(0); }); @@ -69,14 +71,17 @@ describe('Sidebar store', function () { this.store.addAssignee(ASSIGNEE); foundAssignee = this.store.findAssignee(ASSIGNEE); + expect(foundAssignee).toBeDefined(); expect(foundAssignee).toEqual(ASSIGNEE); foundAssignee = this.store.findAssignee(ANOTHER_ASSINEE); + expect(foundAssignee).toBeUndefined(); }); it('removes all assignees', () => { this.store.removeAllAssignees(); + expect(this.store.assignees.length).toEqual(0); }); @@ -108,6 +113,7 @@ describe('Sidebar store', function () { }; this.store.setAssigneeData(users); + expect(this.store.isFetching.assignees).toBe(false); expect(this.store.assignees.length).toEqual(3); }); @@ -128,6 +134,7 @@ describe('Sidebar store', function () { it('set time tracking data', () => { this.store.setTimeTrackingData(Mock.time); + expect(this.store.timeEstimate).toEqual(Mock.time.time_estimate); expect(this.store.totalTimeSpent).toEqual(Mock.time.total_time_spent); expect(this.store.humanTimeEstimate).toEqual(Mock.time.human_time_estimate); diff --git a/spec/javascripts/sidebar/subscriptions_spec.js b/spec/javascripts/sidebar/subscriptions_spec.js index f0a53e573c3..16ff3c043fe 100644 --- a/spec/javascripts/sidebar/subscriptions_spec.js +++ b/spec/javascripts/sidebar/subscriptions_spec.js @@ -47,6 +47,7 @@ describe('Subscriptions', function () { spyOn(vm, '$emit'); vm.toggleSubscription(); + expect(eventHub.$emit).toHaveBeenCalledWith('toggleSubscription', jasmine.any(Object)); expect(vm.$emit).toHaveBeenCalledWith('toggleSubscription', jasmine.any(Object)); }); @@ -56,6 +57,7 @@ describe('Subscriptions', function () { spyOn(vm, '$emit'); vm.onClickCollapsedIcon(); + expect(vm.$emit).toHaveBeenCalledWith('toggleSidebar'); }); }); diff --git a/spec/javascripts/sidebar/todo_spec.js b/spec/javascripts/sidebar/todo_spec.js index a929b804a29..d1d90109405 100644 --- a/spec/javascripts/sidebar/todo_spec.js +++ b/spec/javascripts/sidebar/todo_spec.js @@ -103,6 +103,7 @@ describe('SidebarTodo', () => { it('emits `toggleTodo` event on component', () => { spyOn(vm, '$emit'); vm.handleButtonClick(); + expect(vm.$emit).toHaveBeenCalledWith('toggleTodo'); }); }); @@ -118,6 +119,7 @@ describe('SidebarTodo', () => { container: 'body', boundary: 'viewport', }; + expect(vm.$el.nodeName).toBe('BUTTON'); const elDataAttrs = vm.$el.dataset; @@ -128,6 +130,7 @@ describe('SidebarTodo', () => { it('renders button label element when `collapsed` prop is `false`', () => { const buttonLabelEl = vm.$el.querySelector('span.issuable-todo-inner'); + expect(buttonLabelEl).not.toBeNull(); expect(buttonLabelEl.innerText.trim()).toBe('Mark todo as done'); }); @@ -137,6 +140,7 @@ describe('SidebarTodo', () => { Vue.nextTick() .then(() => { const buttonIconEl = vm.$el.querySelector('svg'); + expect(buttonIconEl).not.toBeNull(); expect(buttonIconEl.querySelector('use').getAttribute('xlink:href')).toContain('todo-done'); }) @@ -149,6 +153,7 @@ describe('SidebarTodo', () => { Vue.nextTick() .then(() => { const loadingEl = vm.$el.querySelector('span.loading-container'); + expect(loadingEl).not.toBeNull(); }) .then(done) |