diff options
Diffstat (limited to 'spec/support/shared_examples/requests/api/hooks_shared_examples.rb')
| -rw-r--r-- | spec/support/shared_examples/requests/api/hooks_shared_examples.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/support/shared_examples/requests/api/hooks_shared_examples.rb b/spec/support/shared_examples/requests/api/hooks_shared_examples.rb index d666a754d9f..f2002de4b55 100644 --- a/spec/support/shared_examples/requests/api/hooks_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/hooks_shared_examples.rb @@ -128,7 +128,8 @@ RSpec.shared_examples 'web-hook API endpoints' do |prefix| get api(hook_uri, user) expect(response).to have_gitlab_http_status(:ok) - expect(json_response).to include('alert_status' => 'disabled') + + expect(json_response).to include('alert_status' => 'disabled') unless hook.executable? end end @@ -142,10 +143,13 @@ RSpec.shared_examples 'web-hook API endpoints' do |prefix| get api(hook_uri, user) expect(response).to have_gitlab_http_status(:ok) - expect(json_response).to include( - 'alert_status' => 'temporarily_disabled', - 'disabled_until' => hook.disabled_until.iso8601(3) - ) + + unless hook.executable? + expect(json_response).to include( + 'alert_status' => 'temporarily_disabled', + 'disabled_until' => hook.disabled_until.iso8601(3) + ) + end end end end |