Merging 50564fb into trunk-temp/pr-929/ef397729-4ae7-4b1d-a091-6c894e…

…321e14
arcjet · Jun 12, 2024 · 8a787e6 · 8a787e6
2 parents ea1c2b2 + 50564fb
commit 8a787e6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/arcjet/package.json b/arcjet/package.json
@@ -43,7 +43,6 @@
     "@arcjet/analyze": "1.0.0-alpha.14",
     "@arcjet/duration": "1.0.0-alpha.14",
     "@arcjet/headers": "1.0.0-alpha.14",
-    "@arcjet/logger": "1.0.0-alpha.14",
     "@arcjet/protocol": "1.0.0-alpha.14",
     "@arcjet/runtime": "1.0.0-alpha.14"
   },

diff --git a/arcjet/test/index.edge.test.ts b/arcjet/test/index.edge.test.ts
@@ -1,7 +1,14 @@
 /**
  * @jest-environment @edge-runtime/jest-environment
  */
-import { describe, expect, test, jest } from "@jest/globals";
+import {
+  describe,
+  expect,
+  test,
+  jest,
+  beforeEach,
+  afterEach,
+} from "@jest/globals";
 
 import arcjet, {
   rateLimit,
@@ -11,11 +18,28 @@ import arcjet, {
   ArcjetReason,
   ArcjetAllowDecision,
 } from "../index";
-import { Logger } from "@arcjet/logger";
+
+beforeEach(() => {
+  jest.useFakeTimers();
+});
+
+afterEach(() => {
+  jest.useRealTimers();
+  jest.clearAllTimers();
+  jest.clearAllMocks();
+  jest.restoreAllMocks();
+});
 
 class ArcjetTestReason extends ArcjetReason {}
 
-const log = new Logger({ level: "info" });
+const log = {
+  time: jest.fn(),
+  timeEnd: jest.fn(),
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+};
 
 describe("Arcjet: Env = Edge runtime", () => {
   test("should create a new instance", async () => {

diff --git a/arcjet/test/index.node.test.ts b/arcjet/test/index.node.test.ts
@@ -9,7 +9,6 @@ import {
   jest,
   test,
 } from "@jest/globals";
-import { Logger } from "@arcjet/logger";
 
 import arcjet, {
   ArcjetMode,
@@ -122,7 +121,14 @@ function assertIsLocalRule(rule: ArcjetRule): asserts rule is ArcjetLocalRule {
 
 class ArcjetTestReason extends ArcjetReason {}
 
-const log = new Logger({ level: "info" });
+const log = {
+  time: jest.fn(),
+  timeEnd: jest.fn(),
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+};
 
 describe("ArcjetDecision", () => {
   test("will default the `id` property if not specified", () => {
@@ -3013,8 +3019,6 @@ describe("SDK", () => {
       "extra-test": "extra-test-value",
     };
 
-    const errorLogSpy = jest.spyOn(log, "error");
-
     function testRuleLocalThrowString(): ArcjetLocalRule {
       return {
         mode: ArcjetMode.LIVE,
@@ -3036,8 +3040,8 @@ describe("SDK", () => {
 
     const _ = await aj.protect({}, request);
 
-    expect(errorLogSpy).toHaveBeenCalledTimes(1);
-    expect(errorLogSpy).toHaveBeenCalledWith(
+    expect(log.error).toHaveBeenCalledTimes(1);
+    expect(log.error).toHaveBeenCalledWith(
       "Failure running rule: %s due to %s",
       "TEST_RULE_LOCAL_THROW_STRING",
       "Local rule protect failed",
@@ -3066,8 +3070,6 @@ describe("SDK", () => {
       "extra-test": "extra-test-value",
     };
 
-    const errorLogSpy = jest.spyOn(log, "error");
-
     function testRuleLocalThrowNull(): ArcjetLocalRule {
       return {
         mode: ArcjetMode.LIVE,
@@ -3089,8 +3091,8 @@ describe("SDK", () => {
 
     const _ = await aj.protect({}, request);
 
-    expect(errorLogSpy).toHaveBeenCalledTimes(1);
-    expect(errorLogSpy).toHaveBeenCalledWith(
+    expect(log.error).toHaveBeenCalledTimes(1);
+    expect(log.error).toHaveBeenCalledWith(
       "Failure running rule: %s due to %s",
       "TEST_RULE_LOCAL_THROW_NULL",
       "Unknown problem",