summaryrefslogtreecommitdiff
path: root/spec/models/hooks
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-01-22 11:13:37 -0800
committerJosh Frye <joshfng@gmail.com>2016-01-29 09:14:16 -0500
commit91b9cbff8de538c2966bca94c517ee6aa346f79b (patch)
tree9bce929d696fca03c86bba32f73fdb057541b024 /spec/models/hooks
parent227728712ec5b469a36dbaf8c9511098b4817741 (diff)
downloadgitlab-ce-91b9cbff8de538c2966bca94c517ee6aa346f79b.tar.gz
First pass at deleting projects in the background.
Diffstat (limited to 'spec/models/hooks')
-rw-r--r--spec/models/hooks/system_hook_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
index 138b87a9a06..fd1513cab1b 100644
--- a/spec/models/hooks/system_hook_spec.rb
+++ b/spec/models/hooks/system_hook_spec.rb
@@ -36,7 +36,7 @@ describe SystemHook, models: true do
it "project_destroy hook" do
user = create(:user)
project = create(:empty_project, namespace: user.namespace)
- Projects::DestroyService.new(project, user, {}).execute
+ Projects::DestroyService.new(project, user, {}).pending_delete!
expect(WebMock).to have_requested(:post, @system_hook.url).with(
body: /project_destroy/,
headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
@@ -65,7 +65,7 @@ describe SystemHook, models: true do
project = create(:project)
project.team << [user, :master]
expect(WebMock).to have_requested(:post, @system_hook.url).with(
- body: /user_add_to_team/,
+ body: /user_add_to_team/,
headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
).once
end
@@ -76,7 +76,7 @@ describe SystemHook, models: true do
project.team << [user, :master]
project.project_members.destroy_all
expect(WebMock).to have_requested(:post, @system_hook.url).with(
- body: /user_remove_from_team/,
+ body: /user_remove_from_team/,
headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
).once
end