summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-12 16:48:47 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-12 16:48:47 +0800
commit9fdcbcb0de414967618cfd7f26141e85805fcb54 (patch)
tree42c7ab3867e78ac285fef4fbb95044221554c20a
parentd5264e8804bca70e613c418a9d346f5787c6fc7a (diff)
downloadgitlab-ce-9fdcbcb0de414967618cfd7f26141e85805fcb54.tar.gz
Have trait all_events_enabled so that's easier to reuse, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13823349
-rw-r--r--spec/factories/project_hooks.rb12
-rw-r--r--spec/requests/api/project_hooks_spec.rb7
2 files changed, 15 insertions, 4 deletions
diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index 3195fb3ddcc..c709432c865 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -5,5 +5,17 @@ FactoryGirl.define do
trait :token do
token { SecureRandom.hex(10) }
end
+
+ trait :all_events_enabled do
+ %w[push_events
+ merge_requests_events
+ tag_push_events
+ issues_events
+ note_events
+ build_events
+ pipeline_events].each do |event|
+ send(event, true)
+ end
+ end
end
end
diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb
index 92c38e69283..914e88c9487 100644
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
@@ -7,10 +7,9 @@ describe API::API, 'ProjectHooks', api: true do
let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
let!(:hook) do
create(:project_hook,
- project: project, url: "http://example.com",
- push_events: true, merge_requests_events: true,
- tag_push_events: true, issues_events: true, note_events: true,
- build_events: true, pipeline_events: true,
+ :all_events_enabled,
+ project: project,
+ url: 'http://example.com',
enable_ssl_verification: true)
end