1 files changed, 68 insertions, 86 deletions
diff --git a/spec/features/projects/releases/user_views_releases_spec.rb b/spec/features/projects/releases/user_views_releases_spec.rb
index 98935fdf872..a7348b62fc0 100644
--- a/spec/features/projects/releases/user_views_releases_spec.rb
+++ b/spec/features/projects/releases/user_views_releases_spec.rb
@@ -24,129 +24,111 @@ RSpec.describe 'User views releases', :js do
     stub_default_url_options(host: 'localhost')
   end
 
-  shared_examples 'releases index page' do
-    context('when the user is a maintainer') do
-      before do
-        sign_in(maintainer)
+  context('when the user is a maintainer') do
+    before do
+      sign_in(maintainer)
 
-        visit project_releases_path(project)
+      visit project_releases_path(project)
 
-        wait_for_requests
-      end
+      wait_for_requests
+    end
 
-      it 'sees the release' do
-        page.within("##{release_v1.tag}") do
-          expect(page).to have_content(release_v1.name)
-          expect(page).to have_content(release_v1.tag)
-          expect(page).not_to have_content('Upcoming Release')
-        end
+    it 'sees the release' do
+      page.within("##{release_v1.tag}") do
+        expect(page).to have_content(release_v1.name)
+        expect(page).to have_content(release_v1.tag)
+        expect(page).not_to have_content('Upcoming Release')
       end
+    end
 
-      it 'renders the correct links', :aggregate_failures do
-        page.within("##{release_v1.tag} .js-assets-list") do
-          external_link_indicator_selector = '[data-testid="external-link-indicator"]'
+    it 'renders the correct links', :aggregate_failures do
+      page.within("##{release_v1.tag} .js-assets-list") do
+        external_link_indicator_selector = '[data-testid="external-link-indicator"]'
 
-          expect(page).to have_link internal_link.name, href: internal_link.url
-          expect(find_link(internal_link.name)).not_to have_css(external_link_indicator_selector)
+        expect(page).to have_link internal_link.name, href: internal_link.url
+        expect(find_link(internal_link.name)).not_to have_css(external_link_indicator_selector)
 
-          expect(page).to have_link internal_link_with_redirect.name, href: Gitlab::Routing.url_helpers.project_release_url(project, release_v1) << "/downloads#{internal_link_with_redirect.filepath}"
-          expect(find_link(internal_link_with_redirect.name)).not_to have_css(external_link_indicator_selector)
+        expect(page).to have_link internal_link_with_redirect.name, href: Gitlab::Routing.url_helpers.project_release_url(project, release_v1) << "/downloads#{internal_link_with_redirect.filepath}"
+        expect(find_link(internal_link_with_redirect.name)).not_to have_css(external_link_indicator_selector)
 
-          expect(page).to have_link external_link.name, href: external_link.url
-          expect(find_link(external_link.name)).to have_css(external_link_indicator_selector)
-        end
+        expect(page).to have_link external_link.name, href: external_link.url
+        expect(find_link(external_link.name)).to have_css(external_link_indicator_selector)
       end
+    end
 
-      context 'with an upcoming release' do
-        it 'sees the upcoming tag' do
-          page.within("##{release_v3.tag}") do
-            expect(page).to have_content('Upcoming Release')
-          end
+    context 'with an upcoming release' do
+      it 'sees the upcoming tag' do
+        page.within("##{release_v3.tag}") do
+          expect(page).to have_content('Upcoming Release')
         end
       end
+    end
 
-      context 'with a tag containing a slash' do
-        it 'sees the release' do
-          page.within("##{release_v2.tag.parameterize}") do
-            expect(page).to have_content(release_v2.name)
-            expect(page).to have_content(release_v2.tag)
-          end
+    context 'with a tag containing a slash' do
+      it 'sees the release' do
+        page.within("##{release_v2.tag.parameterize}") do
+          expect(page).to have_content(release_v2.name)
+          expect(page).to have_content(release_v2.tag)
         end
       end
+    end
 
-      context 'sorting' do
-        def sort_page(by:, direction:)
-          within '[data-testid="releases-sort"]' do
-            find('.dropdown-toggle').click
-
-            click_button(by, class: 'dropdown-item')
-
-            find('.sorting-direction-button').click if direction == :ascending
-          end
-        end
-
-        shared_examples 'releases sort order' do
-          it "sorts the releases #{description}" do
-            card_titles = page.all('.release-block .card-title', minimum: expected_releases.count)
-
-            card_titles.each_with_index do |title, index|
-              expect(title).to have_content(expected_releases[index].name)
-            end
-          end
-        end
+    context 'sorting' do
+      def sort_page(by:, direction:)
+        within '[data-testid="releases-sort"]' do
+          find('.dropdown-toggle').click
 
-        context "when the page is sorted by the default sort order" do
-          let(:expected_releases) { [release_v3, release_v2, release_v1] }
+          click_button(by, class: 'dropdown-item')
 
-          it_behaves_like 'releases sort order'
+          find('.sorting-direction-button').click if direction == :ascending
         end
+      end
 
-        context "when the page is sorted by created_at ascending " do
-          let(:expected_releases) { [release_v2, release_v1, release_v3] }
+      shared_examples 'releases sort order' do
+        it "sorts the releases #{description}" do
+          card_titles = page.all('.release-block .card-title', minimum: expected_releases.count)
 
-          before do
-            sort_page by: 'Created date', direction: :ascending
+          card_titles.each_with_index do |title, index|
+            expect(title).to have_content(expected_releases[index].name)
           end
-
-          it_behaves_like 'releases sort order'
         end
       end
-    end
 
-    context('when the user is a guest') do
-      before do
-        sign_in(guest)
-      end
+      context "when the page is sorted by the default sort order" do
+        let(:expected_releases) { [release_v3, release_v2, release_v1] }
 
-      it 'renders release info except for Git-related data' do
-        visit project_releases_path(project)
+        it_behaves_like 'releases sort order'
+      end
 
-        within('.release-block', match: :first) do
-          expect(page).to have_content(release_v3.description)
-          expect(page).to have_content(release_v3.tag)
-          expect(page).to have_content(release_v3.name)
+      context "when the page is sorted by created_at ascending " do
+        let(:expected_releases) { [release_v2, release_v1, release_v3] }
 
-          # The following properties (sometimes) include Git info,
-          # so they are not rendered for Guest users
-          expect(page).not_to have_content(release_v3.commit.short_id)
+        before do
+          sort_page by: 'Created date', direction: :ascending
         end
+
+        it_behaves_like 'releases sort order'
       end
     end
   end
 
-  context 'when the releases_index_apollo_client feature flag is enabled' do
+  context('when the user is a guest') do
     before do
-      stub_feature_flags(releases_index_apollo_client: true)
+      sign_in(guest)
     end
 
-    it_behaves_like 'releases index page'
-  end
+    it 'renders release info except for Git-related data' do
+      visit project_releases_path(project)
 
-  context 'when the releases_index_apollo_client feature flag is disabled' do
-    before do
-      stub_feature_flags(releases_index_apollo_client: false)
-    end
+      within('.release-block', match: :first) do
+        expect(page).to have_content(release_v3.description)
+        expect(page).to have_content(release_v3.tag)
+        expect(page).to have_content(release_v3.name)
 
-    it_behaves_like 'releases index page'
+        # The following properties (sometimes) include Git info,
+        # so they are not rendered for Guest users
+        expect(page).not_to have_content(release_v3.commit.short_id)
+      end
+    end
   end
 end