summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-13 03:11:09 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-13 03:11:09 +0000
commit361b2b135ff020cb628f1d0617e191a8bde620bf (patch)
treebb2d38479a35c33d2ce5c7b3404f4ea4fd56176b /spec/requests
parentb4d55948af8eedcf8fb3caf96faefd7fe2b1a208 (diff)
parent44129aceaf6d26ae52834548072a91f6fc62f74b (diff)
downloadgitlab-ce-361b2b135ff020cb628f1d0617e191a8bde620bf.tar.gz
Merge branch '26325-system-hooks' into 'master'
Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/system_hooks_spec.rb3
-rw-r--r--spec/requests/api/v3/system_hooks_spec.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb
index c7b84173570..2eb191d6049 100644
--- a/spec/requests/api/system_hooks_spec.rb
+++ b/spec/requests/api/system_hooks_spec.rb
@@ -32,8 +32,9 @@ describe API::SystemHooks do
expect(response).to include_pagination_headers
expect(json_response).to be_an Array
expect(json_response.first['url']).to eq(hook.url)
- expect(json_response.first['push_events']).to be true
+ expect(json_response.first['push_events']).to be false
expect(json_response.first['tag_push_events']).to be false
+ expect(json_response.first['repository_update_events']).to be true
end
end
end
diff --git a/spec/requests/api/v3/system_hooks_spec.rb b/spec/requests/api/v3/system_hooks_spec.rb
index 72c7d14b8ba..ae427541abb 100644
--- a/spec/requests/api/v3/system_hooks_spec.rb
+++ b/spec/requests/api/v3/system_hooks_spec.rb
@@ -31,8 +31,9 @@ describe API::V3::SystemHooks do
expect(response).to have_http_status(200)
expect(json_response).to be_an Array
expect(json_response.first['url']).to eq(hook.url)
- expect(json_response.first['push_events']).to be true
+ expect(json_response.first['push_events']).to be false
expect(json_response.first['tag_push_events']).to be false
+ expect(json_response.first['repository_update_events']).to be true
end
end
end