Commit d7f2a5cc authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '196653-replace-underscore-with-lodash' into 'master'

Remove usage of underscore from ./spec/javascripts/boards

See merge request gitlab-org/gitlab!25456
parents e4e4fba0 87c13920
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
/* global ListLabel */ /* global ListLabel */
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import _ from 'underscore';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import '~/boards/models/label'; import '~/boards/models/label';
import '~/boards/models/assignee'; import '~/boards/models/assignee';
...@@ -40,7 +39,7 @@ describe('List model', () => { ...@@ -40,7 +39,7 @@ describe('List model', () => {
list = new List({ list = new List({
title: 'test', title: 'test',
label: { label: {
id: _.random(10000), id: 1,
title: 'test', title: 'test',
color: 'red', color: 'red',
text_color: 'white', text_color: 'white',
...@@ -96,8 +95,8 @@ describe('List model', () => { ...@@ -96,8 +95,8 @@ describe('List model', () => {
const listDup = new List(listObjDuplicate); const listDup = new List(listObjDuplicate);
const issue = new ListIssue({ const issue = new ListIssue({
title: 'Testing', title: 'Testing',
id: _.random(10000), id: 1,
iid: _.random(10000), iid: 1,
confidential: false, confidential: false,
labels: [list.label, listDup.label], labels: [list.label, listDup.label],
assignees: [], assignees: [],
...@@ -129,8 +128,8 @@ describe('List model', () => { ...@@ -129,8 +128,8 @@ describe('List model', () => {
list.issues.push( list.issues.push(
new ListIssue({ new ListIssue({
title: 'Testing', title: 'Testing',
id: _.random(10000) + i, id: i,
iid: _.random(10000) + i, iid: i,
confidential: false, confidential: false,
labels: [list.label], labels: [list.label],
assignees: [], assignees: [],
...@@ -151,7 +150,7 @@ describe('List model', () => { ...@@ -151,7 +150,7 @@ describe('List model', () => {
list.issues.push( list.issues.push(
new ListIssue({ new ListIssue({
title: 'Testing', title: 'Testing',
id: _.random(10000), id: 1,
confidential: false, confidential: false,
labels: [list.label], labels: [list.label],
assignees: [], assignees: [],
...@@ -192,7 +191,7 @@ describe('List model', () => { ...@@ -192,7 +191,7 @@ describe('List model', () => {
list.issues.push( list.issues.push(
new ListIssue({ new ListIssue({
title: 'Testing', title: 'Testing',
id: _.random(10000), id: 1,
confidential: false, confidential: false,
labels: [new ListLabel(list.label)], labels: [new ListLabel(list.label)],
assignees: [], assignees: [],
...@@ -200,7 +199,7 @@ describe('List model', () => { ...@@ -200,7 +199,7 @@ describe('List model', () => {
); );
const dummyIssue = new ListIssue({ const dummyIssue = new ListIssue({
title: 'new issue', title: 'new issue',
id: _.random(10000), id: 2,
confidential: false, confidential: false,
labels: [new ListLabel(list.label)], labels: [new ListLabel(list.label)],
assignees: [user], assignees: [user],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment