Commit 18b62e5d authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'disable-group-level-integration-test' into 'master'

Disable group-level integration testing feature

See merge request gitlab-org/gitlab!40739
parents 448371a3 27528e2c
...@@ -351,10 +351,10 @@ class Service < ApplicationRecord ...@@ -351,10 +351,10 @@ class Service < ApplicationRecord
{ success: result.present?, result: result } { success: result.present?, result: result }
end end
# Disable test for instance-level services. # Disable test for instance-level and group-level services.
# https://gitlab.com/gitlab-org/gitlab/-/issues/213138 # https://gitlab.com/gitlab-org/gitlab/-/issues/213138
def can_test? def can_test?
!instance? !instance? && !group_id
end end
# Returns a hash of the properties that have been assigned a new value since last save, # Returns a hash of the properties that have been assigned a new value since last save,
......
...@@ -171,6 +171,16 @@ RSpec.describe Service do ...@@ -171,6 +171,16 @@ RSpec.describe Service do
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
end end
context 'when group-level service' do
Service.available_services_types.each do |service_type|
let(:service) do
service_type.constantize.new(group_id: group.id)
end
it { is_expected.to be_falsey }
end
end
end end
describe '#test' do describe '#test' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment