Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 2 insertions, 99 deletions

diff --git a/spec/requests/api/maven_packages_spec.rb b/spec/requests/api/maven_packages_spec.rb
index 3a015e98fb1..4fc5fcf8282 100644
--- a/spec/requests/api/maven_packages_spec.rb
+++ b/spec/requests/api/maven_packages_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe API::MavenPackages do
 
   shared_examples 'rejecting the request for non existing maven path' do |expected_status: :not_found|
     before do
-      if Feature.enabled?(:check_maven_path_first)
+      if Feature.enabled?(:check_maven_path_first, default_enabled: :yaml)
         expect(::Packages::Maven::PackageFinder).not_to receive(:new)
       end
     end
@@ -299,22 +299,6 @@ RSpec.describe API::MavenPackages do
       end
     end
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)
@@ -346,22 +330,6 @@ RSpec.describe API::MavenPackages do
 
     it_behaves_like 'processing HEAD requests', instance_level: true
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'processing HEAD requests', instance_level: true
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'processing HEAD requests', instance_level: true
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)
@@ -468,8 +436,7 @@ RSpec.describe API::MavenPackages do
 
           subject
 
-          status = Feature.enabled?(:maven_packages_group_level_improvements, default_enabled: :yaml) ? :not_found : :forbidden
-          expect(response).to have_gitlab_http_status(status)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
 
         it 'denies download when no private token' do
@@ -594,22 +561,6 @@ RSpec.describe API::MavenPackages do
       end
     end
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)
@@ -639,22 +590,6 @@ RSpec.describe API::MavenPackages do
     let(:path) { package.maven_metadatum.path }
     let(:url) { "/groups/#{group.id}/-/packages/maven/#{path}/#{package_file.file_name}" }
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'processing HEAD requests'
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'processing HEAD requests'
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)
@@ -743,22 +678,6 @@ RSpec.describe API::MavenPackages do
       end
     end
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'handling all conditions'
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)
@@ -789,22 +708,6 @@ RSpec.describe API::MavenPackages do
     let(:path) { package.maven_metadatum.path }
     let(:url) { "/projects/#{project.id}/packages/maven/#{path}/#{package_file.file_name}" }
 
-    context 'with maven_packages_group_level_improvements enabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: true)
-      end
-
-      it_behaves_like 'processing HEAD requests'
-    end
-
-    context 'with maven_packages_group_level_improvements disabled' do
-      before do
-        stub_feature_flags(maven_packages_group_level_improvements: false)
-      end
-
-      it_behaves_like 'processing HEAD requests'
-    end
-
     context 'with check_maven_path_first enabled' do
       before do
         stub_feature_flags(check_maven_path_first: true)