Add latest changes from gitlab-org/gitlab@master

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/requests/api/services_spec.rb b/spec/requests/api/services_spec.rb
index 5528a0c094f..63ed57c5045 100644
--- a/spec/requests/api/services_spec.rb
+++ b/spec/requests/api/services_spec.rb
@@ -264,4 +264,34 @@ RSpec.describe API::Services do
       expect(json_response['properties']['notify_only_broken_pipelines']).to eq(true)
     end
   end
+
+  describe 'Hangouts Chat service' do
+    let(:service_name) { 'hangouts-chat' }
+    let(:params) do
+      {
+        webhook: 'https://hook.example.com',
+        branches_to_be_notified: 'default'
+      }
+    end
+
+    before do
+      project.create_hangouts_chat_service(
+        active: true,
+        properties: params
+      )
+    end
+
+    it 'accepts branches_to_be_notified for update', :aggregate_failures do
+      put api("/projects/#{project.id}/services/#{service_name}", user), params: params.merge(branches_to_be_notified: 'all')
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['properties']['branches_to_be_notified']).to eq('all')
+    end
+
+    it 'only requires the webhook param' do
+      put api("/projects/#{project.id}/services/#{service_name}", user), params: { webhook: 'https://hook.example.com' }
+
+      expect(response).to have_gitlab_http_status(:ok)
+    end
+  end
 end