Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-11-04 06:15:05 +0300
committerStan Hu <stanhu@gmail.com>2018-11-04 06:15:05 +0300
commit9f7d75fd4eb2ee7717295c0941ac2c093ee1f70e (patch)
tree27c0d0b28fd335a23cde122b0939eeda16b8a552
parent4d3ff28a6a0d81f44ccb3eb1602996e5d7c3de1c (diff)
parent13dbfa90d285b4614388bdca1e59fa6f5dd540f1 (diff)
Merge branch '53467-transient-failure-in-spec-controllers-groups-boards_controller_spec-rb' into 'master'
Resolve "Transient failure in spec/controllers/groups/boards_controller_spec.rb" Closes #53467 See merge request gitlab-org/gitlab-ce!22785
-rw-r--r--spec/controllers/groups/boards_controller_spec.rb7
-rw-r--r--spec/controllers/projects/boards_controller_spec.rb5
2 files changed, 7 insertions, 5 deletions
diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb
index f7a4a4192d6..99429c93b82 100644
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/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'
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb
index 667eaa5e34f..8d503f6ad32 100644
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/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