Merge branch 'issue-boards-test-fix' into 'master'

spec/javascripts/boards/boards_store_spec.js

@@ -50,9 +50,9 @@ describe('Store', () => {
 
     it('finds list by ID', () => {
       gl.issueBoards.BoardsStore.addList(listObj);
-      const list = gl.issueBoards.BoardsStore.findList('id', 1);
+      const list = gl.issueBoards.BoardsStore.findList('id', listObj.id);
 
-      expect(list.id).toBe(1);
+      expect(list.id).toBe(listObj.id);
     });
 
     it('finds list by type', () => {
@@ -64,7 +64,7 @@ describe('Store', () => {
 
     it('gets issue when new list added', (done) => {
       gl.issueBoards.BoardsStore.addList(listObj);
-      const list = gl.issueBoards.BoardsStore.findList('id', 1);
+      const list = gl.issueBoards.BoardsStore.findList('id', listObj.id);
 
       expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(1);
 
@@ -89,9 +89,9 @@ describe('Store', () => {
       expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(1);
 
       setTimeout(() => {
-        const list = gl.issueBoards.BoardsStore.findList('id', 1);
+        const list = gl.issueBoards.BoardsStore.findList('id', listObj.id);
         expect(list).toBeDefined();
-        expect(list.id).toBe(1);
+        expect(list.id).toBe(listObj.id);
         expect(list.position).toBe(0);
         done();
       }, 0);
@@ -126,7 +126,7 @@ describe('Store', () => {
 
       expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(1);
 
-      gl.issueBoards.BoardsStore.removeList(1, 'label');
+      gl.issueBoards.BoardsStore.removeList(listObj.id, 'label');
 
       expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(0);
     });
@@ -137,7 +137,7 @@ describe('Store', () => {
 
       expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2);
 
-      gl.issueBoards.BoardsStore.moveList(listOne, ['2', '1']);
+      gl.issueBoards.BoardsStore.moveList(listOne, [listObjDuplicate.id, listObj.id]);
 
       expect(listOne.position).toBe(1);
     });

spec/javascripts/boards/list_spec.js

@@ -43,7 +43,7 @@ describe('List model', () => {
     list = new List({
       title: 'test',
       label: {
-        id: 1,
+        id: _.random(10000),
         title: 'test',
         color: 'red'
       }
@@ -51,7 +51,7 @@ describe('List model', () => {
     list.save();
 
     setTimeout(() => {
-      expect(list.id).toBe(1);
+      expect(list.id).toBe(listObj.id);
       expect(list.type).toBe('label');
       expect(list.position).toBe(0);
       done();
@@ -60,7 +60,7 @@ describe('List model', () => {
 
   it('destroys the list', (done) => {
     gl.issueBoards.BoardsStore.addList(listObj);
-    list = gl.issueBoards.BoardsStore.findList('id', 1);
+    list = gl.issueBoards.BoardsStore.findList('id', listObj.id);
     expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(1);
     list.destroy();
 
@@ -92,7 +92,7 @@ describe('List model', () => {
     const listDup = new List(listObjDuplicate);
     const issue = new ListIssue({
       title: 'Testing',
-      iid: 1,
+      iid: _.random(10000),
       confidential: false,
       labels: [list.label, listDup.label]
     });
@@ -102,7 +102,7 @@ describe('List model', () => {
 
     spyOn(gl.boardService, 'moveIssue').and.callThrough();
 
-    listDup.updateIssueLabel(list, issue);
+    listDup.updateIssueLabel(issue, list);
 
     expect(gl.boardService.moveIssue)
       .toHaveBeenCalledWith(issue.id, list.id, listDup.id, undefined, undefined);

spec/javascripts/boards/mock_data.js

 /* eslint-disable comma-dangle, no-unused-vars, quote-props */
 
 const listObj = {
-  id: 1,
+  id: _.random(10000),
   position: 0,
   title: 'Test',
   list_type: 'label',
   label: {
-    id: 1,
+    id: _.random(10000),
     title: 'Testing',
     color: 'red',
     description: 'testing;'
@@ -14,12 +14,12 @@ const listObj = {
 };
 
 const listObjDuplicate = {
-  id: 2,
+  id: listObj.id,
   position: 1,
   title: 'Test',
   list_type: 'label',
   label: {
-    id: 2,
+    id: listObj.label.id,
     title: 'Testing',
     color: 'red',
     description: 'testing;'