Commit 45950424 authored by Anastasia McDonald's avatar Anastasia McDonald

Merge branch 'qa-shl-check-already-marked-for-deletion' into 'master'

Check if resource is already marked for deletion in ReusableCollection

See merge request gitlab-org/gitlab!81789
parents 32293539 0bdbb1f1
......@@ -64,6 +64,10 @@ module QA
end
end
def marked_for_deletion?
!parse_body(api_get_from("#{api_get_path}"))[:marked_for_deletion_on].nil?
end
# Get group badges
#
# @return [Array<QA::Resource::GroupBadge>]
......
......@@ -34,6 +34,7 @@ module QA
def remove_all_via_api!
instance.each_resource do |reuse_as, resource|
next QA::Runtime::Logger.debug("#{resource.class.name} reused as :#{reuse_as} has already been removed.") unless resource.exists?
next if resource.respond_to?(:marked_for_deletion?) && resource.marked_for_deletion?
resource.method(:remove_via_api!).super_method.call
end
......
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