Add latest changes from gitlab-org/gitlab@master

1 files changed, 90 insertions, 92 deletions

diff --git a/spec/requests/api/group_packages_spec.rb b/spec/requests/api/group_packages_spec.rb
index 7c7e8da3fb1..e02f6099637 100644
--- a/spec/requests/api/group_packages_spec.rb
+++ b/spec/requests/api/group_packages_spec.rb
@@ -13,135 +13,133 @@ RSpec.describe API::GroupPackages do
     let(:url) { "/groups/#{group.id}/packages" }
     let(:package_schema) { 'public_api/v4/packages/group_packages' }
 
-    context 'without the need for a license' do
-      context 'with sorting' do
-        let_it_be(:package1) { create(:npm_package, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }
-        let_it_be(:package2) { create(:nuget_package, project: project, version: '2.0.4') }
-        let(:package3) { create(:maven_package, project: project, version: '1.1.1', name: 'zzz') }
-
-        before do
-          travel_to(1.day.ago) do
-            package3
-          end
+    context 'with sorting' do
+      let_it_be(:package1) { create(:npm_package, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }
+      let_it_be(:package2) { create(:nuget_package, project: project, version: '2.0.4') }
+      let(:package3) { create(:maven_package, project: project, version: '1.1.1', name: 'zzz') }
+
+      before do
+        travel_to(1.day.ago) do
+          package3
         end
+      end
 
-        context 'without sorting params' do
-          let(:packages) { [package3, package1, package2] }
+      context 'without sorting params' do
+        let(:packages) { [package3, package1, package2] }
 
-          it 'sorts by created_at asc' do
-            subject
+        it 'sorts by created_at asc' do
+          subject
 
-            expect(json_response.map { |package| package['id'] }).to eq(packages.map(&:id))
-          end
+          expect(json_response.map { |package| package['id'] }).to eq(packages.map(&:id))
         end
+      end
 
-        it_behaves_like 'package sorting', 'name' do
-          let(:packages) { [package1, package2, package3] }
-        end
+      it_behaves_like 'package sorting', 'name' do
+        let(:packages) { [package1, package2, package3] }
+      end
 
-        it_behaves_like 'package sorting', 'created_at' do
-          let(:packages) { [package3, package1, package2] }
-        end
+      it_behaves_like 'package sorting', 'created_at' do
+        let(:packages) { [package3, package1, package2] }
+      end
 
-        it_behaves_like 'package sorting', 'version' do
-          let(:packages) { [package3, package2, package1] }
-        end
+      it_behaves_like 'package sorting', 'version' do
+        let(:packages) { [package3, package2, package1] }
+      end
 
-        it_behaves_like 'package sorting', 'type' do
-          let(:packages) { [package3, package1, package2] }
-        end
+      it_behaves_like 'package sorting', 'type' do
+        let(:packages) { [package3, package1, package2] }
+      end
 
-        it_behaves_like 'package sorting', 'project_path' do
-          let(:another_project) { create(:project, :public, namespace: group, name: 'project B') }
-          let!(:package4) { create(:npm_package, project: another_project, version: '3.1.0', name: "@#{project.root_namespace.path}/bar") }
+      it_behaves_like 'package sorting', 'project_path' do
+        let(:another_project) { create(:project, :public, namespace: group, name: 'project B') }
+        let!(:package4) { create(:npm_package, project: another_project, version: '3.1.0', name: "@#{project.root_namespace.path}/bar") }
 
-          let(:packages) { [package1, package2, package3, package4] }
-        end
+        let(:packages) { [package1, package2, package3, package4] }
       end
+    end
 
-      context 'with private group' do
-        let!(:package1) { create(:package, project: project) }
-        let!(:package2) { create(:package, project: project) }
+    context 'with private group' do
+      let!(:package1) { create(:package, project: project) }
+      let!(:package2) { create(:package, project: project) }
 
-        let(:group) { create(:group, :private) }
-        let(:subgroup) { create(:group, :private, parent: group) }
-        let(:project) { create(:project, :private, namespace: group) }
-        let(:subproject) { create(:project, :private, namespace: subgroup) }
+      let(:group) { create(:group, :private) }
+      let(:subgroup) { create(:group, :private, parent: group) }
+      let(:project) { create(:project, :private, namespace: group) }
+      let(:subproject) { create(:project, :private, namespace: subgroup) }
 
-        context 'with unauthenticated user' do
-          it_behaves_like 'rejects packages access', :group, :no_type, :not_found
-        end
+      context 'with unauthenticated user' do
+        it_behaves_like 'rejects packages access', :group, :no_type, :not_found
+      end
+
+      context 'with authenticated user' do
+        subject { get api(url, user) }
+
+        it_behaves_like 'returns packages', :group, :owner
+        it_behaves_like 'returns packages', :group, :maintainer
+        it_behaves_like 'returns packages', :group, :developer
+        it_behaves_like 'rejects packages access', :group, :reporter, :forbidden
+        it_behaves_like 'rejects packages access', :group, :guest, :forbidden
 
-        context 'with authenticated user' do
-          subject { get api(url, user) }
+        context 'with subgroup' do
+          let(:subgroup) { create(:group, :private, parent: group) }
+          let(:subproject) { create(:project, :private, namespace: subgroup) }
+          let!(:package3) { create(:npm_package, project: subproject) }
 
-          it_behaves_like 'returns packages', :group, :owner
-          it_behaves_like 'returns packages', :group, :maintainer
-          it_behaves_like 'returns packages', :group, :developer
+          it_behaves_like 'returns packages with subgroups', :group, :owner
+          it_behaves_like 'returns packages with subgroups', :group, :maintainer
+          it_behaves_like 'returns packages with subgroups', :group, :developer
           it_behaves_like 'rejects packages access', :group, :reporter, :forbidden
           it_behaves_like 'rejects packages access', :group, :guest, :forbidden
 
-          context 'with subgroup' do
-            let(:subgroup) { create(:group, :private, parent: group) }
-            let(:subproject) { create(:project, :private, namespace: subgroup) }
-            let!(:package3) { create(:npm_package, project: subproject) }
+          context 'excluding subgroup' do
+            let(:url) { "/groups/#{group.id}/packages?exclude_subgroups=true" }
 
-            it_behaves_like 'returns packages with subgroups', :group, :owner
-            it_behaves_like 'returns packages with subgroups', :group, :maintainer
-            it_behaves_like 'returns packages with subgroups', :group, :developer
+            it_behaves_like 'returns packages', :group, :owner
+            it_behaves_like 'returns packages', :group, :maintainer
+            it_behaves_like 'returns packages', :group, :developer
             it_behaves_like 'rejects packages access', :group, :reporter, :forbidden
             it_behaves_like 'rejects packages access', :group, :guest, :forbidden
-
-            context 'excluding subgroup' do
-              let(:url) { "/groups/#{group.id}/packages?exclude_subgroups=true" }
-
-              it_behaves_like 'returns packages', :group, :owner
-              it_behaves_like 'returns packages', :group, :maintainer
-              it_behaves_like 'returns packages', :group, :developer
-              it_behaves_like 'rejects packages access', :group, :reporter, :forbidden
-              it_behaves_like 'rejects packages access', :group, :guest, :forbidden
-            end
           end
         end
       end
+    end
 
-      context 'with public group' do
-        let_it_be(:package1) { create(:package, project: project) }
-        let_it_be(:package2) { create(:package, project: project) }
+    context 'with public group' do
+      let_it_be(:package1) { create(:package, project: project) }
+      let_it_be(:package2) { create(:package, project: project) }
 
-        context 'with unauthenticated user' do
-          it_behaves_like 'returns packages', :group, :no_type
-        end
+      context 'with unauthenticated user' do
+        it_behaves_like 'returns packages', :group, :no_type
+      end
 
-        context 'with authenticated user' do
-          subject { get api(url, user) }
+      context 'with authenticated user' do
+        subject { get api(url, user) }
 
-          it_behaves_like 'returns packages', :group, :owner
-          it_behaves_like 'returns packages', :group, :maintainer
-          it_behaves_like 'returns packages', :group, :developer
-          it_behaves_like 'returns packages', :group, :reporter
-          it_behaves_like 'returns packages', :group, :guest
-        end
+        it_behaves_like 'returns packages', :group, :owner
+        it_behaves_like 'returns packages', :group, :maintainer
+        it_behaves_like 'returns packages', :group, :developer
+        it_behaves_like 'returns packages', :group, :reporter
+        it_behaves_like 'returns packages', :group, :guest
       end
+    end
 
-      context 'with pagination params' do
-        let_it_be(:package1) { create(:package, project: project) }
-        let_it_be(:package2) { create(:package, project: project) }
-        let_it_be(:package3) { create(:npm_package, project: project) }
-        let_it_be(:package4) { create(:npm_package, project: project) }
+    context 'with pagination params' do
+      let_it_be(:package1) { create(:package, project: project) }
+      let_it_be(:package2) { create(:package, project: project) }
+      let_it_be(:package3) { create(:npm_package, project: project) }
+      let_it_be(:package4) { create(:npm_package, project: project) }
 
-        it_behaves_like 'returns paginated packages'
-      end
+      it_behaves_like 'returns paginated packages'
+    end
 
-      it_behaves_like 'filters on each package_type', is_project: false
+    it_behaves_like 'filters on each package_type', is_project: false
 
-      context 'does not accept non supported package_type value' do
-        include_context 'package filter context'
+    context 'does not accept non supported package_type value' do
+      include_context 'package filter context'
 
-        let(:url) { group_filter_url(:type, 'foo') }
+      let(:url) { group_filter_url(:type, 'foo') }
 
-        it_behaves_like 'returning response status', :bad_request
-      end
+      it_behaves_like 'returning response status', :bad_request
     end
   end
 end