Upgrade Jest + cleanup test output (#246)

* Upgrade Jest + cleanup test output

* suppress errors

* fix tsc

Author: guyca

packages/eslint-plugin-obsidian/package.json

@@ -5,7 +5,7 @@
   "version": "2.26.1",
   "scripts": {
     "build": "npx tsc --project tsconfig.prod.json",
-    "test": "npx jest",
+    "test": "npx jest --colors",
     "lint": "eslint src --ignore-pattern '*.d.ts' --ext .ts,.tsx,.js",
     "prepublishOnly": "yarn build"
   },
@@ -53,7 +53,7 @@
     "eslint-plugin-unused-imports": "^4.1.4",
     "external-lib-a": "file:./tests/fixtures/external-lib-a",
     "external-lib-b": "file:./tests/fixtures/external-lib-b",
-    "jest": "^29.7.0",
+    "jest": "30.2.0",
     "jest-extended": "^4.0.2",
     "react-obsidian": "workspace:*",
     "typescript": "^5.8.0"

packages/eslint-plugin-obsidian/src/dto/callExpression.ts

@@ -20,7 +20,7 @@ export class CallExpression {
   get generics() {
     return this.node.typeArguments ?
       new Generics(this.node.typeArguments) :
-      this.node.typeParameters && new Generics(this.node.typeParameters);
+      undefined;
   }
 
   private get callee(): TSESTree.Identifier {

packages/react-obsidian/package.json

@@ -9,9 +9,9 @@
     "pretest": "tsc --project tsconfig.json",
     "test": "yarn test:all",
     "test:all": "yarn test:legacy && yarn test:modern",
-    "test:legacy": "BABEL_CONFIG_PATH=./babel.config.legacy.js npx jest",
-    "test:modern": "npx jest",
-    "test-coverage": "npx jest --coverage"
+    "test:legacy": "BABEL_CONFIG_PATH=./babel.config.legacy.js npx jest --colors",
+    "test:modern": "npx jest --colors",
+    "test-coverage": "npx jest --coverage --colors"
   },
   "main": "dist/src/index.js",
   "directories": {
@@ -41,7 +41,7 @@
     "@stylistic/eslint-plugin": "^1.7.0",
     "@testing-library/react": "14.x.x",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/jest-when": "^3.5.5",
     "@types/lodash": "^4.14.176",
     "@types/react": "18.3.x",
@@ -59,8 +59,8 @@
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "jest": "29.7.x",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest": "30.2.0",
+    "jest-environment-jsdom": "30.2.0",
     "jest-extended": "^4.0.2",
     "jest-mock-extended": "^3.0.7",
     "jest-when": "^3.7.0",

packages/react-obsidian/src/graph/PropertyRetriever.test.ts

@@ -33,7 +33,7 @@ describe('PropertyRetriever', () => {
 
   it('throws on circular dependencies', () => {
     const uut1 = new PropertyRetriever(new CircularDependencyGraph2());
-    expect(() => uut1.retrieve('dep1')).toThrowError(
+    expect(() => uut1.retrieve('dep1')).toThrow(
       /Could not resolve dep1 from CircularDependencyGraph2\d because of a circular dependency: dep1 -> dep2 -> dep3 -> dep1/,
     );
   });

packages/react-obsidian/src/injectors/components/InjectComponent.test.tsx

@@ -37,7 +37,7 @@ describe('injectComponent', () => {
 
   it('Throws an error if the Graph is undefined', () => {
     const Graph = undefined as unknown as Constructable<ObjectGraph>;
-    expect(() => injectComponent(component, Graph)).toThrowError(
+    expect(() => injectComponent(component, Graph)).toThrow(
       `injectComponent was called with an undefined Graph.`
       + `This is probably not an issue with Obsidian.`
       + `It's typically caused by circular dependencies.`

packages/react-obsidian/src/observable/mediator/MediatorObservable.test.ts

@@ -85,9 +85,7 @@ describe('MediatorObservable', () => {
   it('should throw an error if a subscriber is already subscribed', () => {
     const subscriber = () => {};
     uut.subscribe(subscriber);
-    expect(() => uut.subscribe(subscriber)).toThrowError(
-      'Subscriber already subscribed',
-    );
+    expect(() => uut.subscribe(subscriber)).toThrow('Subscriber already subscribed');
   });
 
   it('should mediate between observers of different types', () => {

packages/react-obsidian/src/observable/observable.test.ts

@@ -48,7 +48,7 @@ describe('makeObservable', () => {
     const observable = new Observable({});
     const subscriber = () => {};
     observable.subscribe(subscriber);
-    expect(() => observable.subscribe(subscriber)).toThrowError('Subscriber already subscribed');
+    expect(() => observable.subscribe(subscriber)).toThrow('Subscriber already subscribed');
   });
 
   it('should unsubscribe', () => {
@@ -71,7 +71,7 @@ describe('makeObservable', () => {
   it('should throw error because the subscriber is not subscribed', () => {
     const observable = new Observable({});
     const subscriber = () => { };
-    expect(() => observable.unsubscribe(subscriber)).toThrowError(`Can't unsubscribe, subscriber doesn't exist`);
+    expect(() => observable.unsubscribe(subscriber)).toThrow(`Can't unsubscribe, subscriber doesn't exist`);
   });
 
   it('should await the current value', async () => {

packages/react-obsidian/test/acceptance/obtain.test.ts

@@ -17,7 +17,7 @@ describe('obtain', () => {
   it('Should throw circular dependency error when encountering circular dependencies', () => {
     expect(
       () => Obsidian.obtain(CircularDependencyGraph).aString(),
-    ).toThrowError(/Could not resolve aString from CircularDependencyGraph\d because of a circular dependency: aString -> aString$/);
+    ).toThrow(/Could not resolve aString from CircularDependencyGraph\d because of a circular dependency: aString -> aString$/);
   });
 
   it('Should not throw circular dependency error resolving valid dependencies', () => {
@@ -27,7 +27,7 @@ describe('obtain', () => {
   });
 
   it('describes the circular dependency path in the thrown exception', () => {
-    expect(() => Obsidian.obtain(CircularDependencyFromSubgraph).dep1()).toThrowError(
+    expect(() => Obsidian.obtain(CircularDependencyFromSubgraph).dep1()).toThrow(
       // eslint-disable-next-line max-len
       /Could not resolve dep1 from CircularDependencyFromSubgraph\d because of a circular dependency: dep1 -> dep2 -> dep3 -> dep2/,
     );

packages/react-obsidian/test/integration/customScopedLifecycleBoundGraphs.test.tsx

@@ -8,6 +8,7 @@ import {
   Singleton,
 } from '../../src';
 import graphRegistry  from '../../src/graph/registry/GraphRegistry';
+import { restoreConsoleErrors, suppressConsoleErrors } from '../utils/console';
 
 describe('custom scoped lifecycle-bound graphs', () => {
   it('instantiates custom scoped graphs eagerly', () => {
@@ -38,9 +39,11 @@ describe('custom scoped lifecycle-bound graphs', () => {
   });
 
   it('throws when trying to use a scoped subgraph from an unscoped graph', async () => {
+    suppressConsoleErrors();
     expect(() => {
       render(<ComponentThatWronglyReliesOnCustomScopedGraph />);
     }).toThrow(/Cannot instantiate the scoped graph 'CustomScopeGraph' as a subgraph of 'UnscopedGraph' because the scopes do not match. undefined !== customScope/);
+    restoreConsoleErrors();
   });
 
   it('eagerly instantiates nested scoped graphs', () => {

packages/react-obsidian/test/utils/console.ts

@@ -0,0 +1,9 @@
+let errorSpy: jest.SpyInstance;
+
+export function suppressConsoleErrors() {
+  errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+}
+
+export function restoreConsoleErrors() {
+  errorSpy?.mockRestore();
+}