Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 16 insertions, 48 deletions

diff --git a/spec/graphql/resolvers/releases_resolver_spec.rb b/spec/graphql/resolvers/releases_resolver_spec.rb
index 6ba9a6c33a1..58f6257c946 100644
--- a/spec/graphql/resolvers/releases_resolver_spec.rb
+++ b/spec/graphql/resolvers/releases_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::ReleasesResolver do
+RSpec.describe Resolvers::ReleasesResolver, feature_category: :release_orchestration do
   include GraphqlHelpers
 
   let_it_be(:today) { Time.now }
@@ -24,60 +24,28 @@ RSpec.describe Resolvers::ReleasesResolver do
   end
 
   describe '#resolve' do
-    context 'when the user does not have access to the project' do
-      let(:current_user) { public_user }
+    it_behaves_like 'releases and group releases resolver'
 
-      it 'returns an empty array' do
-        expect(resolve_releases).to be_empty
-      end
-    end
-
-    context "when the user has full access to the project's releases" do
+    describe 'when order_by is created_at' do
       let(:current_user) { developer }
 
-      it 'returns all releases associated to the project' do
-        expect(resolve_releases).to match_array(all_releases)
-      end
-
-      describe 'sorting behavior' do
-        context 'with sort: :released_at_desc' do
-          let(:args) { { sort: :released_at_desc } }
-
-          it 'returns the releases ordered by released_at in descending order' do
-            expect(resolve_releases.to_a)
-              .to match_array(all_releases)
-              .and be_sorted(:released_at, :desc)
-          end
-        end
-
-        context 'with sort: :released_at_asc' do
-          let(:args) { { sort: :released_at_asc } }
-
-          it 'returns the releases ordered by released_at in ascending order' do
-            expect(resolve_releases.to_a)
-              .to match_array(all_releases)
-              .and be_sorted(:released_at, :asc)
-          end
-        end
-
-        context 'with sort: :created_desc' do
-          let(:args) { { sort: :created_desc } }
+      context 'with sort: desc' do
+        let(:args) { { sort: :created_desc } }
 
-          it 'returns the releases ordered by created_at in descending order' do
-            expect(resolve_releases.to_a)
-              .to match_array(all_releases)
-              .and be_sorted(:created_at, :desc)
-          end
+        it 'returns the releases ordered by created_at in descending order' do
+          expect(resolve_releases.to_a)
+            .to match_array(all_releases)
+            .and be_sorted(:created_at, :desc)
         end
+      end
 
-        context 'with sort: :created_asc' do
-          let(:args) { { sort: :created_asc } }
+      context 'with sort: asc' do
+        let(:args) { { sort: :created_asc } }
 
-          it 'returns the releases ordered by created_at in ascending order' do
-            expect(resolve_releases.to_a)
-              .to match_array(all_releases)
-              .and be_sorted(:created_at, :asc)
-          end
+        it 'returns the releases ordered by created_at in ascending order' do
+          expect(resolve_releases.to_a)
+            .to match_array(all_releases)
+            .and be_sorted(:created_at, :asc)
         end
       end
     end