diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-08 03:39:27 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-08 03:39:27 +0300 |
commit | 7734e85bc6592c5ad3330c611c5f83a051b680b0 (patch) | |
tree | 10af9444dee64a8720ac4674e5e215ebcc5d7beb /spec/controllers | |
parent | f8e06b50eea2aecaf1f37fb7228292e8516e2613 (diff) | |
parent | 93af1af67fc6af2805f3342aed1fc15a4360870d (diff) |
Merge branch 'ce-jej/github-project-service-for-ci' into 'master'
Backport changes from introducing GithubService interation in EE
See merge request gitlab-org/gitlab-ce!17607
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/services_controller_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb index 847ac6f2be0..e4dc61b3a68 100644 --- a/spec/controllers/projects/services_controller_spec.rb +++ b/spec/controllers/projects/services_controller_spec.rb @@ -23,6 +23,18 @@ describe Projects::ServicesController do end end + context 'when validations fail' do + let(:service_params) { { active: 'true', token: '' } } + + it 'returns error messages in JSON response' do + put :test, namespace_id: project.namespace, project_id: project, id: :hipchat, service: service_params + + expect(json_response['message']).to eq "Validations failed." + expect(json_response['service_response']).to eq "Token can't be blank" + expect(response).to have_gitlab_http_status(200) + end + end + context 'success' do context 'with empty project' do let(:project) { create(:project) } |