Update Boards::Lists::MoveService to move lists inside a specific board

2 files changed, 6 insertions, 5 deletions

diff --git a/app/services/boards/lists/move_service.rb b/app/services/boards/lists/move_service.rb
index 020ff69f4a7..7d0730e8332 100644
--- a/app/services/boards/lists/move_service.rb
+++ b/app/services/boards/lists/move_service.rb
@@ -2,6 +2,7 @@ module Boards
   module Lists
     class MoveService < Boards::BaseService
       def execute(list)
+        @board = list.board
         @old_position = list.position
         @new_position = params[:position]
 
@@ -16,7 +17,7 @@ module Boards
 
       private
 
-      attr_reader :old_position, :new_position
+      attr_reader :board, :old_position, :new_position
 
       def valid_move?
         new_position.present? && new_position != old_position &&
diff --git a/spec/services/boards/lists/move_service_spec.rb b/spec/services/boards/lists/move_service_spec.rb
index 102ed67449d..63fa0bb8c5f 100644
--- a/spec/services/boards/lists/move_service_spec.rb
+++ b/spec/services/boards/lists/move_service_spec.rb
@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Boards::Lists::MoveService, services: true do
   describe '#execute' do
-    let(:project) { create(:project_with_board) }
-    let(:board)   { project.board }
+    let(:project) { create(:empty_project) }
+    let(:board)   { create(:board, project: project) }
     let(:user)    { create(:user) }
 
-    let!(:backlog)     { project.board.backlog_list }
+    let!(:backlog)     { create(:backlog_list, board: board) }
     let!(:planning)    { create(:list, board: board, position: 0) }
     let!(:development) { create(:list, board: board, position: 1) }
     let!(:review)      { create(:list, board: board, position: 2) }
     let!(:staging)     { create(:list, board: board, position: 3) }
-    let!(:done)        { project.board.done_list }
+    let!(:done)        { create(:done_list, board: board) }
 
     context 'when list type is set to label' do
       it 'keeps position of lists when new position is nil' do