Merge branch 'main' into test-new-faker-instance

faker-js · Mar 26, 2022 · 57329ed · 57329ed
2 parents 6b5fb8d + 2f61cfd
commit 57329ed
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -111,15 +111,15 @@
     "lint-staged": "~12.3.7",
     "npm-run-all": "~4.1.5",
     "picocolors": "~1.0.0",
-    "prettier": "2.6.0",
+    "prettier": "2.6.1",
     "prettier-plugin-organize-imports": "~2.3.4",
     "rimraf": "~3.0.2",
     "sanitize-html": "~2.7.0",
     "simple-git-hooks": "~2.7.0",
     "standard-version": "~9.3.2",
     "typedoc": "~0.22.13",
     "typedoc-plugin-missing-exports": "~0.22.6",
-    "typescript": "~4.6.2",
+    "typescript": "~4.6.3",
     "validator": "~13.7.0",
     "vite": "~2.8.6",
     "vitepress": "~0.22.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/unique.spec.ts b/test/unique.spec.ts
@@ -133,4 +133,21 @@ describe('unique', () => {
     });
     expect(result).toBe('http');
   });
+
+  it('no conflict', () => {
+    let i = 0;
+    const method = () => `no conflict: ${i++}`;
+    expect(faker.unique(method)).toBe('no conflict: 0');
+    expect(faker.unique(method)).toBe('no conflict: 1');
+  });
+
+  it('with conflict', () => {
+    const method = () => 'with conflict: 0';
+    expect(faker.unique(method)).toBe('with conflict: 0');
+    expect(() =>
+      faker.unique(method, [], {
+        maxRetries: 1,
+      })
+    ).toThrow();
+  });
 });