1 files changed, 40 insertions, 38 deletions

diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index e81e9e0bf2f..b62fbaead6f 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -17,10 +17,6 @@ RSpec.describe API::Tags do
   end
 
   describe 'GET /projects/:id/repository/tags', :use_clean_rails_memory_store_caching do
-    before do
-      stub_feature_flags(tag_list_keyset_pagination: false)
-    end
-
     let(:route) { "/projects/#{project_id}/repository/tags" }
 
     context 'sorting' do
@@ -59,6 +55,18 @@ RSpec.describe API::Tags do
 
         expect(json_response.map { |tag| tag['name'] }).to eq(ordered_by_name)
       end
+
+      it 'sorts by version in ascending order when requested' do
+        repository = project.repository
+        repository.add_tag(user, 'v1.2.0', repository.commit.id)
+        repository.add_tag(user, 'v1.10.0', repository.commit.id)
+
+        get api("#{route}?order_by=version&sort=asc", current_user)
+
+        ordered_by_version = VersionSorter.sort(project.repository.tags.map { |tag| tag.name })
+
+        expect(json_response.map { |tag| tag['name'] }).to eq(ordered_by_version)
+      end
     end
 
     context 'searching' do
@@ -154,50 +162,44 @@ RSpec.describe API::Tags do
       end
     end
 
-    context 'with keyset pagination on', :aggregate_errors do
-      before do
-        stub_feature_flags(tag_list_keyset_pagination: true)
-      end
-
-      context 'with keyset pagination option' do
-        let(:base_params) { { pagination: 'keyset' } }
+    context 'with keyset pagination option', :aggregate_errors do
+      let(:base_params) { { pagination: 'keyset' } }
 
-        context 'with gitaly pagination params' do
-          context 'with high limit' do
-            let(:params) { base_params.merge(per_page: 100) }
+      context 'with gitaly pagination params' do
+        context 'with high limit' do
+          let(:params) { base_params.merge(per_page: 100) }
 
-            it 'returns all repository tags' do
-              get api(route, user), params: params
+          it 'returns all repository tags' do
+            get api(route, user), params: params
 
-              expect(response).to have_gitlab_http_status(:ok)
-              expect(response).to match_response_schema('public_api/v4/tags')
-              expect(response.headers).not_to include('Link')
-              tag_names = json_response.map { |x| x['name'] }
-              expect(tag_names).to match_array(project.repository.tag_names)
-            end
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(response).to match_response_schema('public_api/v4/tags')
+            expect(response.headers).not_to include('Link')
+            tag_names = json_response.map { |x| x['name'] }
+            expect(tag_names).to match_array(project.repository.tag_names)
           end
+        end
 
-          context 'with low limit' do
-            let(:params) { base_params.merge(per_page: 2) }
+        context 'with low limit' do
+          let(:params) { base_params.merge(per_page: 2) }
 
-            it 'returns limited repository tags' do
-              get api(route, user), params: params
+          it 'returns limited repository tags' do
+            get api(route, user), params: params
 
-              expect(response).to have_gitlab_http_status(:ok)
-              expect(response).to match_response_schema('public_api/v4/tags')
-              expect(response.headers).to include('Link')
-              tag_names = json_response.map { |x| x['name'] }
-              expect(tag_names).to match_array(%w(v1.1.0 v1.1.1))
-            end
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(response).to match_response_schema('public_api/v4/tags')
+            expect(response.headers).to include('Link')
+            tag_names = json_response.map { |x| x['name'] }
+            expect(tag_names).to match_array(%w(v1.1.0 v1.1.1))
           end
+        end
 
-          context 'with missing page token' do
-            let(:params) { base_params.merge(page_token: 'unknown') }
+        context 'with missing page token' do
+          let(:params) { base_params.merge(page_token: 'unknown') }
 
-            it_behaves_like '422 response' do
-              let(:request) { get api(route, user), params: params }
-              let(:message) { 'Invalid page token: refs/tags/unknown' }
-            end
+          it_behaves_like '422 response' do
+            let(:request) { get api(route, user), params: params }
+            let(:message) { 'Invalid page token: refs/tags/unknown' }
           end
         end
       end