Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 24 deletions

diff --git a/spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb b/spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb
index 3f8c3b8960b..6b0ae589efb 100644
--- a/spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb
+++ b/spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb
@@ -235,18 +235,6 @@ RSpec.shared_examples 'Debian Distribution' do |factory, container, can_freeze|
           it 'does not return them' do
             expect(subject.to_a).not_to include(package_file_pending_destruction)
           end
-
-          context 'with packages_installable_package_files disabled' do
-            before do
-              stub_feature_flags(packages_installable_package_files: false)
-            end
-
-            it 'returns them' do
-              subject
-
-              expect(subject.to_a).to include(package_file_pending_destruction)
-            end
-          end
         end
       end
     end
diff --git a/spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb b/spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb
index 9385706d991..ab93f54111b 100644
--- a/spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb
@@ -49,17 +49,5 @@ RSpec.shared_examples 'a package with files' do
 
       expect(response_package_file_ids).not_to include(package_file_pending_destruction.to_global_id.to_s)
     end
-
-    context 'with packages_installable_package_files disabled' do
-      before(:context) do
-        stub_feature_flags(packages_installable_package_files: false)
-      end
-
-      it 'returns them' do
-        expect(package.reload.package_files).to include(package_file_pending_destruction)
-
-        expect(response_package_file_ids).to include(package_file_pending_destruction.to_global_id.to_s)
-      end
-    end
   end
 end