From 41203686c3964774bae878be91dc92fa86d8b725 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 30 May 2017 04:26:46 -0500 Subject: [PATCH] Fix tests and eslint errors [ci skip] --- .../javascripts/groups/services/groups_service.js | 2 ++ spec/javascripts/groups/group_item_spec.js | 2 +- spec/javascripts/groups/groups_spec.js | 2 +- spec/javascripts/groups/mock_data.js | 12 ++++++++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/groups/services/groups_service.js b/app/assets/javascripts/groups/services/groups_service.js index f2abe2681db..86e911b73b9 100644 --- a/app/assets/javascripts/groups/services/groups_service.js +++ b/app/assets/javascripts/groups/services/groups_service.js @@ -1,3 +1,5 @@ +/* eslint-disable class-methods-use-this */ + import Vue from 'vue'; import VueResource from 'vue-resource'; diff --git a/spec/javascripts/groups/group_item_spec.js b/spec/javascripts/groups/group_item_spec.js index 08e22728aba..ed441242085 100644 --- a/spec/javascripts/groups/group_item_spec.js +++ b/spec/javascripts/groups/group_item_spec.js @@ -26,7 +26,7 @@ describe('Groups Component', () => { it('should render the group item', () => { expect(component.$el.classList.contains('group-row')).toBe(true); expect(component.$el.querySelector('.number-projects').textContent).toContain(group.numberProjects); - expect(component.$el.querySelector('.number-members').textContent).toContain(group.numberMembers); + expect(component.$el.querySelector('.number-users').textContent).toContain(group.numberUsers); expect(component.$el.querySelector('.group-visibility')).toBeDefined(); expect(component.$el.querySelector('.avatar-container')).toBeDefined(); expect(component.$el.querySelector('.title').textContent).toContain(group.name); diff --git a/spec/javascripts/groups/groups_spec.js b/spec/javascripts/groups/groups_spec.js index 47ca90551c7..d1f900df3d8 100644 --- a/spec/javascripts/groups/groups_spec.js +++ b/spec/javascripts/groups/groups_spec.js @@ -48,7 +48,7 @@ describe('Groups Component', () => { expect(lists.length).toBe(3); // one parent and two subgroups expect(lists[0].querySelector('#group-1119').classList.contains('is-open')).toBe(true); - expect(lists[0].querySelector('#group-1119').classList.contains('is-expandable')).toBe(true); + expect(lists[0].querySelector('#group-1119').classList.contains('has-subgroups')).toBe(true); expect(lists[2].querySelector('#group-1120').textContent).toContain(groups[1119].subGroups[1120].name); }); diff --git a/spec/javascripts/groups/mock_data.js b/spec/javascripts/groups/mock_data.js index 7d6910137fe..fdb809018cf 100644 --- a/spec/javascripts/groups/mock_data.js +++ b/spec/javascripts/groups/mock_data.js @@ -11,6 +11,9 @@ const group1 = { parent_id: null, created_at: '2017-05-15T19:01:23.670Z', updated_at: '2017-05-15T19:01:23.670Z', + number_projects: '1', + number_users: '1', + has_subgroups: true, permissions: { group_access: 50, }, @@ -30,6 +33,9 @@ const group14 = { parent_id: 1127, created_at: '2017-05-15T19:02:01.645Z', updated_at: '2017-05-15T19:02:01.645Z', + number_projects: '1', + number_users: '1', + has_subgroups: true, permissions: { group_access: 30, }, @@ -48,6 +54,9 @@ const group2 = { parent_id: null, created_at: '2017-05-11T19:35:09.635Z', updated_at: '2017-05-11T19:35:09.635Z', + number_projects: '1', + number_users: '1', + has_subgroups: true, permissions: { group_access: 50, }, @@ -66,6 +75,9 @@ const group21 = { parent_id: 1119, created_at: '2017-05-11T19:51:04.060Z', updated_at: '2017-05-11T19:51:04.060Z', + number_projects: '1', + number_users: '1', + has_subgroups: true, permissions: { group_access: 50, },