2 files changed, 46 insertions, 5 deletions

diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index 91e5fb2a666..f2b79a88a4a 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -3,6 +3,8 @@
 /* global ListLabel */
 import queryData from '../utils/query_data';
 
+const PER_PAGE = 20;
+
 class List {
   constructor (obj) {
     this.id = obj.id;
@@ -58,7 +60,9 @@ class List {
 
   nextPage () {
     if (this.issuesSize > this.issues.length) {
-      this.page += 1;
+      if (this.issues.length / PER_PAGE >= 1) {
+        this.page += 1;
+      }
 
       return this.getIssues(false);
     }
@@ -145,10 +149,7 @@ class List {
   }
 
   updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid) {
-    gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)
-      .then(() => {
-        listFrom.getIssues(false);
-      });
+    gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid);
   }
 
   findIssue (id) {
diff --git a/spec/javascripts/boards/list_spec.js b/spec/javascripts/boards/list_spec.js
index a9d4c6ef76f..24a2da9f6b6 100644
--- a/spec/javascripts/boards/list_spec.js
+++ b/spec/javascripts/boards/list_spec.js
@@ -107,4 +107,44 @@ describe('List model', () => {
     expect(gl.boardService.moveIssue)
       .toHaveBeenCalledWith(issue.id, list.id, listDup.id, undefined, undefined);
   });
+
+  describe('page number', () => {
+    beforeEach(() => {
+      spyOn(list, 'getIssues');
+    });
+
+    it('increase page number if current issue count is more than the page size', () => {
+      for (let i = 0; i < 30; i += 1) {
+        list.issues.push(new ListIssue({
+          title: 'Testing',
+          iid: _.random(10000) + i,
+          confidential: false,
+          labels: [list.label]
+        }));
+      }
+      list.issuesSize = 50;
+
+      expect(list.issues.length).toBe(30);
+
+      list.nextPage();
+
+      expect(list.page).toBe(2);
+      expect(list.getIssues).toHaveBeenCalled();
+    });
+
+    it('does not increase page number if issue count is less than the page size', () => {
+      list.issues.push(new ListIssue({
+        title: 'Testing',
+        iid: _.random(10000),
+        confidential: false,
+        labels: [list.label]
+      }));
+      list.issuesSize = 2;
+
+      list.nextPage();
+
+      expect(list.page).toBe(1);
+      expect(list.getIssues).toHaveBeenCalled();
+    });
+  });
 });