1 files changed, 15 insertions, 82 deletions
diff --git a/spec/models/clusters/agent_token_spec.rb b/spec/models/clusters/agent_token_spec.rb
index ad9f948224f..efa2a3eb09b 100644
--- a/spec/models/clusters/agent_token_spec.rb
+++ b/spec/models/clusters/agent_token_spec.rb
@@ -9,17 +9,29 @@ RSpec.describe Clusters::AgentToken do
   it { is_expected.to validate_length_of(:name).is_at_most(255) }
   it { is_expected.to validate_presence_of(:name) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'scopes' do
     describe '.order_last_used_at_desc' do
-      let_it_be(:token_1) { create(:cluster_agent_token, last_used_at: 7.days.ago) }
-      let_it_be(:token_2) { create(:cluster_agent_token, last_used_at: nil) }
-      let_it_be(:token_3) { create(:cluster_agent_token, last_used_at: 2.days.ago) }
+      let_it_be(:agent) { create(:cluster_agent) }
+      let_it_be(:token_1) { create(:cluster_agent_token, agent: agent, last_used_at: 7.days.ago) }
+      let_it_be(:token_2) { create(:cluster_agent_token, agent: agent, last_used_at: nil) }
+      let_it_be(:token_3) { create(:cluster_agent_token, agent: agent, last_used_at: 2.days.ago) }
 
       it 'sorts by last_used_at descending, with null values at last' do
         expect(described_class.order_last_used_at_desc)
           .to eq([token_3, token_1, token_2])
       end
     end
+
+    describe '.with_status' do
+      let!(:active_token) { create(:cluster_agent_token) }
+      let!(:revoked_token) { create(:cluster_agent_token, :revoked) }
+
+      subject { described_class.with_status(:active) }
+
+      it { is_expected.to contain_exactly(active_token) }
+    end
   end
 
   describe '#token' do
@@ -37,83 +49,4 @@ RSpec.describe Clusters::AgentToken do
       expect(agent_token.token.length).to be >= 50
     end
   end
-
-  describe '#track_usage', :clean_gitlab_redis_cache do
-    let_it_be(:agent) { create(:cluster_agent) }
-
-    let(:agent_token) { create(:cluster_agent_token, agent: agent) }
-
-    subject { agent_token.track_usage }
-
-    context 'when last_used_at was updated recently' do
-      before do
-        agent_token.update!(last_used_at: 10.minutes.ago)
-      end
-
-      it 'updates cache but not database' do
-        expect { subject }.not_to change { agent_token.reload.read_attribute(:last_used_at) }
-
-        expect_redis_update
-      end
-    end
-
-    context 'when last_used_at was not updated recently' do
-      it 'updates cache and database' do
-        does_db_update
-        expect_redis_update
-      end
-
-      context 'with invalid token' do
-        before do
-          agent_token.description = SecureRandom.hex(2000)
-        end
-
-        it 'still updates caches and database' do
-          expect(agent_token).to be_invalid
-
-          does_db_update
-          expect_redis_update
-        end
-      end
-
-      context 'agent is inactive' do
-        before do
-          allow(agent).to receive(:active?).and_return(false)
-        end
-
-        it 'creates an activity event' do
-          expect { subject }.to change { agent.activity_events.count }
-
-          event = agent.activity_events.last
-          expect(event).to have_attributes(
-            kind: 'agent_connected',
-            level: 'info',
-            recorded_at: agent_token.reload.read_attribute(:last_used_at),
-            agent_token: agent_token
-          )
-        end
-      end
-
-      context 'agent is active' do
-        before do
-          allow(agent).to receive(:active?).and_return(true)
-        end
-
-        it 'does not create an activity event' do
-          expect { subject }.not_to change { agent.activity_events.count }
-        end
-      end
-    end
-
-    def expect_redis_update
-      Gitlab::Redis::Cache.with do |redis|
-        redis_key = "cache:#{described_class.name}:#{agent_token.id}:attributes"
-        expect(redis.get(redis_key)).to be_present
-      end
-    end
-
-    def does_db_update
-      expect { subject }.to change { agent_token.reload.read_attribute(:last_used_at) }
-    end
-  end
 end