fix: tests

test/e2e/cases/location-overrides.test.ts

@@ -5,7 +5,7 @@ import { waitProbeInCity } from '../utils.js';
 
 const LOCATION_OVERRIDES_TABLE = 'gp_location_overrides';
 
-describe.only('location overrides', () => {
+describe('location overrides', () => {
 	before(async function () {
 		this.timeout(80000);
 

test/tests/unit/ws/synced-probe-list.test.ts

@@ -3,12 +3,10 @@ import { expect } from 'chai';
 
 import type { WsServerNamespace } from '../../../../src/lib/ws/server.js';
 import { SyncedProbeList } from '../../../../src/lib/ws/synced-probe-list.js';
-import { type AdoptedProbe, AdoptedProbes } from '../../../../src/lib/adopted-probes.js';
 import type { Probe } from '../../../../src/probe/types.js';
 import { getRegionByCountry } from '../../../../src/lib/location/location.js';
 import { getRedisClient } from '../../../../src/lib/redis/client.js';
 import { ProbeOverride } from '../../../../src/lib/probe-override.js';
-import { AdminData } from '../../../../src/lib/admin-data.js';
 
 describe('SyncedProbeList', () => {
 	const sandbox = sinon.createSandbox();
@@ -36,9 +34,7 @@ describe('SyncedProbeList', () => {
 		},
 	} as unknown as WsServerNamespace;
 
-	const adoptedProbes = sandbox.createStubInstance(AdoptedProbes);
-	const adminData = new AdminData(sandbox.stub() as any);
-	const probeOverride = new ProbeOverride(adoptedProbes, adminData);
+	const probeOverride = sandbox.createStubInstance(ProbeOverride);
 
 	let syncedProbeList: SyncedProbeList;
 
@@ -47,9 +43,8 @@ describe('SyncedProbeList', () => {
 		redisJsonGet.callThrough();
 		redisPExpire.callThrough();
 		localFetchSocketsStub.resolves([]);
-		adoptedProbes.getUpdatedLocation.callThrough();
-		adoptedProbes.getUpdatedTags.callThrough();
-		adoptedProbes.getUpdatedProbes.callThrough();
+		probeOverride.addAdminData.returnsArg(0);
+		probeOverride.addAdoptedData.returnsArg(0);
 
 		syncedProbeList = new SyncedProbeList(redisClient, ioNamespace, probeOverride);
 	});
@@ -282,17 +277,17 @@ describe('SyncedProbeList', () => {
 		expect(syncedProbeList.getProbes()).to.be.empty;
 	});
 
-	it('applies adoption data to getProbes()/fetchProbes() but not to getRawProbes()', async () => {
-		const sockets = [
-			{ data: { probe: { client: 'A', location: { ...location }, tags: [], ipAddress: '1.1.1.1' } } },
-			{ data: { probe: { client: 'B', location: { ...location }, tags: [] } } },
-		];
+	it('applies adoption data to getProbes()/fetchProbes() but not to getRawProbes()/getProbesWithAdminData()', async () => {
+		const probe1 = { client: 'A', location: { ...location }, tags: [], ipAddress: '1.1.1.1' } as unknown as Probe;
+		const probe2 = { client: 'B', location: { ...location }, tags: [] } as unknown as Probe;
+		const sockets = [{ data: { probe: probe1 } }, { data: { probe: probe2 } }];
+
+		const tags = [{ type: 'user', value: 'u-name-tag1' }] as Probe['tags'];
 
-		const tags = [{ type: 'user', value: 'u-name-tag1' }] as AdoptedProbe['tags'];
-		const adoptedProbe = { tags } as AdoptedProbe;
+		const adoptedProbe = { tags } as Probe;
 
 		localFetchSocketsStub.resolves(sockets);
-		adoptedProbes.getByIp.withArgs('1.1.1.1').returns(adoptedProbe);
+		probeOverride.addAdoptedData.returns([ adoptedProbe, probe2 ]);
 
 		const fetchedProbesPromise = syncedProbeList.fetchProbes();
 		clock.tick(1);
@@ -307,10 +302,43 @@ describe('SyncedProbeList', () => {
 		expect(fetchedProbes[0]).to.deep.include({ tags });
 		expect(fetchedProbes[1]).not.to.deep.include({ tags });
 
+		expect(syncedProbeList.getProbesWithAdminData()[0]).not.to.deep.include({ tags });
+		expect(syncedProbeList.getProbesWithAdminData()[1]).not.to.deep.include({ tags });
+
 		expect(syncedProbeList.getRawProbes()[0]).not.to.deep.include({ tags });
 		expect(syncedProbeList.getRawProbes()[1]).not.to.deep.include({ tags });
 	});
 
+	it('applies admin location override data to getProbes()/fetchProbes()/getProbesWithAdminData() but not to getRawProbes()', async () => {
+		const probe1 = { client: 'A', location: { ...location }, tags: [], ipAddress: '1.1.1.1' } as unknown as Probe;
+		const probe2 = { client: 'B', location: { ...location }, tags: [] } as unknown as Probe;
+		const sockets = [{ data: { probe: probe1 } }, { data: { probe: probe2 } }];
+
+		const updatedProbe = { probe1, location: { ...probe1.location, city: 'Miami' } } as unknown as Probe;
+
+		localFetchSocketsStub.resolves(sockets);
+		probeOverride.addAdminData.returns([ updatedProbe, probe2 ]);
+
+		const fetchedProbesPromise = syncedProbeList.fetchProbes();
+		clock.tick(1);
+
+		await syncedProbeList.sync();
+		const fetchedProbes = await fetchedProbesPromise;
+
+		expect(localFetchSocketsStub.callCount).to.equal(1);
+		expect(syncedProbeList.getProbes()[0]?.location.city).to.deep.equal('Miami');
+		expect(syncedProbeList.getProbes()[1]?.location.city).to.deep.equal('The New York City');
+
+		expect(fetchedProbes[0]?.location.city).to.deep.equal('Miami');
+		expect(fetchedProbes[1]?.location.city).to.deep.equal('The New York City');
+
+		expect(syncedProbeList.getProbesWithAdminData()[0]?.location.city).to.deep.equal('Miami');
+		expect(syncedProbeList.getProbesWithAdminData()[1]?.location.city).to.deep.equal('The New York City');
+
+		expect(syncedProbeList.getRawProbes()[0]?.location.city).to.deep.equal('The New York City');
+		expect(syncedProbeList.getRawProbes()[1]?.location.city).to.deep.equal('The New York City');
+	});
+
 	it('resolves fetchProbes() only after new data arrives', async () => {
 		const fetchedProbesPromise = syncedProbeList.fetchProbes();