diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/controllers/projects/milestones_controller_spec.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/controllers/projects/milestones_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/milestones_controller_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb index 9e5d41b1075..b93f1b41a7e 100644 --- a/spec/controllers/projects/milestones_controller_spec.rb +++ b/spec/controllers/projects/milestones_controller_spec.rb @@ -33,14 +33,14 @@ RSpec.describe Projects::MilestonesController do view_milestone expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'text/html' + expect(response.media_type).to eq 'text/html' end it 'returns milestone json' do view_milestone 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 @@ -189,7 +189,7 @@ RSpec.describe Projects::MilestonesController do get :labels, params: { namespace_id: group.id, project_id: project.id, id: milestone.iid }, format: :json expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' expect(json_response['html']).not_to include(label.title) end @@ -200,7 +200,7 @@ RSpec.describe Projects::MilestonesController do get :labels, params: { namespace_id: group.id, project_id: project.id, id: milestone.iid }, format: :json expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' expect(json_response['html']).to include(label.title) end @@ -262,7 +262,7 @@ RSpec.describe Projects::MilestonesController do get :participants, params: params expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' expect(json_response['html']).to include(issue_assignee.name) end end @@ -277,7 +277,7 @@ RSpec.describe Projects::MilestonesController do get :participants, params: params expect(response).to have_gitlab_http_status(:ok) - expect(response.content_type).to eq 'application/json' + expect(response.media_type).to eq 'application/json' expect(json_response['html']).not_to include(issue_assignee.name) end end |