Merge branch 'ce-to-ee-2018-11-04' into 'master'

CE upstream - 2018-11-04 03:21 UTC

See merge request gitlab-org/gitlab-ee!8220

spec/controllers/groups/boards_controller_spec.rb

@@ -32,12 +32,13 @@ describe Groups::BoardsController do
       end
 
       it 'renders template if visited board is not found' do
-        visited = double
+        temporary_board = create(:board, group: group)
+        visited = create(:board_group_recent_visit, group: temporary_board.group, board: temporary_board, user: user)
+        temporary_board.delete
 
-        allow(visited).to receive(:board_id).and_return(12)
         allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited)
 
-        list_boards format: :html
+        list_boards
 
         expect(response).to render_template :index
         expect(response.content_type).to eq 'text/html'

spec/controllers/projects/boards_controller_spec.rb

@@ -38,9 +38,10 @@ describe Projects::BoardsController do
       end
 
       it 'renders template if visited board is not found' do
-        visited = double
+        temporary_board = create(:board, project: project)
+        visited = create(:board_project_recent_visit, project: temporary_board.project, board: temporary_board, user: user)
+        temporary_board.delete
 
-        allow(visited).to receive(:board_id).and_return(12)
         allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited)
 
         list_boards