Merge branch 'bw-fix-spec-in-merge' into 'master'

Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
2018-10-30 04:17:53 +00:00 · 2018-10-30 04:17:53 +00:00 · 5a95374182
parent 67d97e3bcc c11cb0b38f
commit 5a95374182
1 changed files with 1 additions and 1 deletions
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/spec/controllers/groups/boards_controller_spec.rb
@ -37,7 +37,7 @@ describe Groups::BoardsController do
        allow(visited).to receive(:board_id).and_return(12)
        allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited)

-        list_boards
+        list_boards format: :html

        expect(response).to render_template :index
        expect(response.content_type).to eq 'text/html'