Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 25 deletions

diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index d8f50fa27bb..1418adb535f 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -602,31 +602,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       )
     end
 
-    context 'with existing container expiration policies' do
-      let_it_be(:disabled) { create(:container_expiration_policy, enabled: false) }
-      let_it_be(:enabled) { create(:container_expiration_policy, enabled: true) }
-
-      ::ContainerExpirationPolicy.older_than_options.keys.each do |value|
-        let_it_be("container_expiration_policy_with_older_than_set_to_#{value}") { create(:container_expiration_policy, older_than: value) }
-      end
-
-      let_it_be('container_expiration_policy_with_older_than_set_to_null') { create(:container_expiration_policy, older_than: nil) }
-
-      let(:inactive_policies) { ::ContainerExpirationPolicy.where(enabled: false) }
-      let(:active_policies) { ::ContainerExpirationPolicy.active }
-
-      subject { described_class.data[:counts] }
-
-      it 'gathers usage data' do
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_unset]).to eq 1
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_7d]).to eq 1
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_14d]).to eq 1
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_30d]).to eq 1
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_60d]).to eq 1
-        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_90d]).to eq 2
-      end
-    end
-
     context 'when queries time out' do
       let(:metric_method) { :count }