Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
index aafea0050d3..0e531dbaf4b 100644
--- a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
+++ b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
@@ -87,6 +87,38 @@ RSpec.describe Profiles::PersonalAccessTokensController do
       end
     end
 
+    context "tokens returned are ordered" do
+      let(:expires_1_day_from_now) { 1.day.from_now.to_date }
+      let(:expires_2_day_from_now) { 2.days.from_now.to_date }
+
+      before do
+        create(:personal_access_token, user: user, name: "Token1", expires_at: expires_1_day_from_now)
+        create(:personal_access_token, user: user, name: "Token2", expires_at: expires_2_day_from_now)
+      end
+
+      it "orders token list ascending on expires_at" do
+        get :index
+
+        first_token = assigns(:active_personal_access_tokens).first.as_json
+        expect(first_token[:name]).to eq("Token1")
+        expect(first_token[:expires_at]).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+      end
+
+      it "orders tokens on id in case token has same expires_at" do
+        create(:personal_access_token, user: user, name: "Token3", expires_at: expires_1_day_from_now)
+
+        get :index
+
+        first_token = assigns(:active_personal_access_tokens).first.as_json
+        expect(first_token[:name]).to eq("Token3")
+        expect(first_token[:expires_at]).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+
+        second_token = assigns(:active_personal_access_tokens).second.as_json
+        expect(second_token[:name]).to eq("Token1")
+        expect(second_token[:expires_at]).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+      end
+    end
+
     context "access_token_pagination feature flag is disabled" do
       before do
         stub_feature_flags(access_token_pagination: false)