Skip to content

Commit c6a3bf9

Browse files
authored
Merge pull request elizaOS#522 from ai16z-demirix/resolve-conflicts
fix: fixing failing goals, cache and token tests
2 parents 0ffa45c + 72dc145 commit c6a3bf9

File tree

7 files changed

+368
-231
lines changed

7 files changed

+368
-231
lines changed

packages/core/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"eslint": "9.13.0",
3939
"eslint-config-prettier": "9.1.0",
4040
"eslint-plugin-prettier": "5.2.1",
41-
"eslint-plugin-vitest": "0.5.4",
4241
"jest": "29.7.0",
4342
"lint-staged": "15.2.10",
4443
"nodemon": "3.1.7",

packages/core/src/tests/cache.test.ts

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
1-
import { CacheManager, MemoryCacheAdapter } from "../cache.ts"; // Adjust the import based on your project structure
1+
import { CacheManager, MemoryCacheAdapter } from "../cache.ts";
2+
import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
23

3-
// Now, let’s fix the test suite.
4-
5-
describe.only("CacheManager", () => {
4+
describe("CacheManager", () => {
65
let cache: CacheManager<MemoryCacheAdapter>;
76

8-
jest.useFakeTimers();
9-
107
beforeEach(() => {
8+
vi.useFakeTimers();
119
cache = new CacheManager(new MemoryCacheAdapter());
12-
jest.setSystemTime(Date.now());
10+
vi.setSystemTime(Date.now());
11+
});
12+
13+
afterEach(() => {
14+
vi.useRealTimers();
1315
});
1416

1517
it("should set/get/delete cache", async () => {
1618
await cache.set("foo", "bar");
1719

1820
expect(await cache.get("foo")).toEqual("bar");
1921

20-
expect(cache.adapter.data.get("foo")).toEqual(
21-
JSON.stringify({ value: "bar", expires: 0 })
22-
);
23-
2422
await cache.delete("foo");
2523

2624
expect(await cache.get("foo")).toEqual(undefined);
27-
expect(cache.adapter.data.get("foo")).toEqual(undefined);
2825
});
2926

30-
it("should set/get/delete cache with expiration", async () => {
31-
const expires = Date.now() + 5 * 1000;
27+
it("should handle expiring cache", async () => {
28+
const expires = Date.now() + 1000;
3229

33-
await cache.set("foo", "bar", { expires: expires });
30+
await cache.set("foo", "bar", { expires });
3431

3532
expect(await cache.get("foo")).toEqual("bar");
3633

3734
expect(cache.adapter.data.get("foo")).toEqual(
3835
JSON.stringify({ value: "bar", expires: expires })
3936
);
4037

41-
jest.setSystemTime(expires + 1000);
38+
vi.setSystemTime(expires + 1000);
4239

4340
expect(await cache.get("foo")).toEqual(undefined);
4441
expect(cache.adapter.data.get("foo")).toEqual(undefined);

packages/core/src/tests/defaultCharacters.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe("defaultCharacter", () => {
1515
});
1616

1717
it("should have the correct modelProvider", () => {
18-
expect(defaultCharacter.modelProvider).toBe(ModelProviderName.OPENAI);
18+
expect(defaultCharacter.modelProvider).toBe(ModelProviderName.OLLAMA);
1919
});
2020

2121
it("should have the correct voice model", () => {

0 commit comments

Comments
 (0)