diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/controllers/projects/boards_controller_spec.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/controllers/projects/boards_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/boards_controller_spec.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb index dad932f9cdf..1ed61e0990f 100644 --- a/spec/controllers/projects/boards_controller_spec.rb +++ b/spec/controllers/projects/boards_controller_spec.rb @@ -27,7 +27,7 @@ RSpec.describe Projects::BoardsController do list_boards expect(response).to render_template :index - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end context 'with unauthorized user' do @@ -41,7 +41,7 @@ RSpec.describe Projects::BoardsController do list_boards expect(response).to have_gitlab_http_status(:not_found) - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end end @@ -57,7 +57,7 @@ RSpec.describe Projects::BoardsController do list_boards expect(response).to render_template :index - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end end end @@ -85,7 +85,7 @@ RSpec.describe Projects::BoardsController do list_boards format: :json expect(response).to have_gitlab_http_status(:not_found) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' end end end @@ -127,7 +127,7 @@ RSpec.describe Projects::BoardsController do expect { read_board board: board }.to change(BoardProjectRecentVisit, :count).by(1) expect(response).to render_template :show - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end context 'with unauthorized user' do @@ -141,7 +141,7 @@ RSpec.describe Projects::BoardsController do read_board board: board expect(response).to have_gitlab_http_status(:not_found) - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end end @@ -154,7 +154,7 @@ RSpec.describe Projects::BoardsController do expect { read_board board: board }.to change(BoardProjectRecentVisit, :count).by(0) expect(response).to render_template :show - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end end end @@ -179,7 +179,7 @@ RSpec.describe Projects::BoardsController do read_board board: board, format: :json expect(response).to have_gitlab_http_status(:not_found) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' end end end |