Fixtures imports/shortcuts updated.

xray-forge · Jun 23, 2023 · b9f6284 · b9f6284
1 parent f357a89
commit b9f6284
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/engine/core/utils/relation/set.test.ts b/src/engine/core/utils/relation/set.test.ts
@@ -18,9 +18,13 @@ import { ERelation } from "@/engine/core/utils/relation/types";
 import { communities } from "@/engine/lib/constants/communities";
 import { ClientObject, ServerActorObject, ServerCreatureObject, ServerHumanObject, TIndex } from "@/engine/lib/types";
 import { mockRelationsSquads } from "@/fixtures/engine";
-import { mockActorClientGameObject, mockClientGameObject, mockServerAlifeCreatureActor } from "@/fixtures/xray";
-import { CLIENT_SIDE_REGISTRY } from "@/fixtures/xray/mocks/interface";
-import { mockServerAlifeCreatureAbstract } from "@/fixtures/xray/mocks/objects/server/cse_alife_creature_abstract.mock";
+import {
+  CLIENT_SIDE_REGISTRY,
+  mockActorClientGameObject,
+  mockClientGameObject,
+  mockServerAlifeCreatureAbstract,
+  mockServerAlifeCreatureActor,
+} from "@/fixtures/xray";
 
 describe("'relation/set' utils", () => {
   it("'setClientObjectRelation' should correctly set objects relation", () => {

diff --git a/src/fixtures/xray/index.ts b/src/fixtures/xray/index.ts
@@ -2,5 +2,6 @@ export * from "@/fixtures/xray/mocks/actions";
 export * from "@/fixtures/xray/mocks/objects";
 export * from "@/fixtures/xray/mocks/ini";
 export * from "@/fixtures/xray/mocks/save";
+export * from "@/fixtures/xray/mocks/interface";
 
 export * from "@/fixtures/xray/mockXRay16";
diff --git a/src/fixtures/xray/mocks/objects/server/Squad.mock.ts b/src/fixtures/xray/mocks/objects/server/Squad.mock.ts
@@ -1,14 +1,14 @@
 import { jest } from "@jest/globals";
 
 import { Squad } from "@/engine/core/objects";
-import { TClassId } from "@/engine/lib/types";
+import { ServerGroupObject, TClassId } from "@/engine/lib/types";
 import { mockLuaTable } from "@/fixtures/lua/mocks/LuaTable.mock";
-import { AbstractLuabindClass } from "@/fixtures/xray/mocks/objects/AbstractLuabindClass";
+import { MockAlifeOnlineOfflineGroup, mockServerAlifeOnlineOfflineGroup } from "@/fixtures/xray";
 
 /**
  * todo
  */
-export class MockSquad extends AbstractLuabindClass {}
+export class MockSquad extends MockAlifeOnlineOfflineGroup {}
 
 /**
  * todo;
@@ -22,10 +22,10 @@ export function mockSquad({
   clsid = jest.fn(() => -1 as TClassId),
   isValidSquadTarget = () => true,
 }: Partial<Squad> = {}): Squad {
-  return {
+  return mockServerAlifeOnlineOfflineGroup({
     simulationProperties: simulationProperties,
     clsid,
     isValidSquadTarget: isValidSquadTarget,
     behaviour,
-  } as unknown as Squad;
+  } as Partial<ServerGroupObject>) as unknown as Squad;
 }
diff --git a/src/fixtures/xray/mocks/objects/server/index.ts b/src/fixtures/xray/mocks/objects/server/index.ts
@@ -1,4 +1,5 @@
 export * from "@/fixtures/xray/mocks/objects/server/Squad.mock";
+export * from "@/fixtures/xray/mocks/objects/server/cse_alife_creature_abstract.mock";
 export * from "@/fixtures/xray/mocks/objects/server/cse_alife_creature_actor.mock";
 export * from "@/fixtures/xray/mocks/objects/server/cse_alife_creature_monster_base.mock";
 export * from "@/fixtures/xray/mocks/objects/server/cse_alife_hanging_lamp.mock";