summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:52 +0000
commit546ddc3f6ac96fdf09934390a938bb391d07dc94 (patch)
treed0c92fca27ee76b5a20b7bfb56bda6f057424127 /spec/controllers
parent04baa85554ff13bdd4d6f4e6bb24119d17608fee (diff)
downloadgitlab-ce-546ddc3f6ac96fdf09934390a938bb391d07dc94.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/groups/settings/ci_cd_controller_spec.rb2
-rw-r--r--spec/controllers/projects/settings/ci_cd_controller_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index 8ba7a96e1ee..b5154f4f877 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -267,7 +267,7 @@ describe Groups::Settings::CiCdController do
it 'creates the deploy token' do
subject
- expect(response).to have_gitlab_http_status(:ok)
+ expect(response).to have_gitlab_http_status(:created)
expect(response).to match_response_schema('public_api/v4/deploy_token')
expect(json_response).to match(expected_response)
end
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index 87b40a02567..8f516de3322 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -300,7 +300,7 @@ describe Projects::Settings::CiCdController do
it 'creates the deploy token' do
subject
- expect(response).to have_gitlab_http_status(:ok)
+ expect(response).to have_gitlab_http_status(:created)
expect(response).to match_response_schema('public_api/v4/deploy_token')
expect(json_response).to match(expected_response)
end