1 files changed, 25 insertions, 43 deletions

diff --git a/spec/features/projects/releases/user_views_releases_spec.rb b/spec/features/projects/releases/user_views_releases_spec.rb
index 993d3371904..323c57570c3 100644
--- a/spec/features/projects/releases/user_views_releases_spec.rb
+++ b/spec/features/projects/releases/user_views_releases_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe 'User views releases', :js do
   shared_examples 'releases page' do
     context('when the user is a maintainer') do
       before do
-        gitlab_sign_in(maintainer)
+        sign_in(maintainer)
       end
 
       it 'sees the release' do
@@ -27,11 +27,23 @@ RSpec.describe 'User views releases', :js do
         expect(page).not_to have_content('Upcoming Release')
       end
 
-      shared_examples 'asset link tests' do
-        context 'when there is a link as an asset' do
-          let!(:release_link) { create(:release_link, release: release, url: url ) }
+      context 'when there is a link as an asset' do
+        let!(:release_link) { create(:release_link, release: release, url: url ) }
+        let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
+        let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath }
+
+        it 'sees the link' do
+          visit project_releases_path(project)
+
+          page.within('.js-assets-list') do
+            expect(page).to have_link release_link.name, href: direct_asset_link
+            expect(page).not_to have_css('[data-testid="external-link-indicator"]')
+          end
+        end
+
+        context 'when there is a link redirect' do
+          let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) }
           let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
-          let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath }
 
           it 'sees the link' do
             visit project_releases_path(project)
@@ -41,51 +53,21 @@ RSpec.describe 'User views releases', :js do
               expect(page).not_to have_css('[data-testid="external-link-indicator"]')
             end
           end
+        end
 
-          context 'when there is a link redirect' do
-            let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) }
-            let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
-
-            it 'sees the link' do
-              visit project_releases_path(project)
-
-              page.within('.js-assets-list') do
-                expect(page).to have_link release_link.name, href: direct_asset_link
-                expect(page).not_to have_css('[data-testid="external-link-indicator"]')
-              end
-            end
-          end
-
-          context 'when url points to external resource' do
-            let(:url) { 'http://google.com/download' }
+        context 'when url points to external resource' do
+          let(:url) { 'http://google.com/download' }
 
-            it 'sees that the link is external resource' do
-              visit project_releases_path(project)
+          it 'sees that the link is external resource' do
+            visit project_releases_path(project)
 
-              page.within('.js-assets-list') do
-                expect(page).to have_css('[data-testid="external-link-indicator"]')
-              end
+            page.within('.js-assets-list') do
+              expect(page).to have_css('[data-testid="external-link-indicator"]')
             end
           end
         end
       end
 
-      context 'when the release_asset_link_type feature flag is enabled' do
-        before do
-          stub_feature_flags(release_asset_link_type: true)
-        end
-
-        it_behaves_like 'asset link tests'
-      end
-
-      context 'when the release_asset_link_type feature flag is disabled' do
-        before do
-          stub_feature_flags(release_asset_link_type: false)
-        end
-
-        it_behaves_like 'asset link tests'
-      end
-
       context 'with an upcoming release' do
         let(:tomorrow) { Time.zone.now + 1.day }
         let!(:release) { create(:release, project: project, released_at: tomorrow ) }
@@ -110,7 +92,7 @@ RSpec.describe 'User views releases', :js do
 
     context('when the user is a guest') do
       before do
-        gitlab_sign_in(guest)
+        sign_in(guest)
       end
 
       it 'renders release info except for Git-related data' do