summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-30 12:14:48 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-30 12:14:48 +0100
commitf862b4ae0faee80344faa583c74389c8e57fb7c2 (patch)
tree60fba79f2e2ca0c96a23ba0495a5cd04a42a0d19 /spec/models
parent3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (diff)
parentf255313ea47b433b428b3b90452aede8c9a6618c (diff)
downloadgitlab-ce-f862b4ae0faee80344faa583c74389c8e57fb7c2.tar.gz
Merge remote-tracking branch 'origin/background-delete-process'
Diffstat (limited to 'spec/models')
-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