Store spy in variable to avoid type error and harmonise naming of sai…

…d variables
infernojs · May 13, 2023 · 54581c7 · 54581c7
1 parent 37ba7ed
commit 54581c7
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/packages/inferno-router/__tests__/BrowserRouter.spec.tsx b/packages/inferno-router/__tests__/BrowserRouter.spec.tsx
@@ -25,19 +25,19 @@ describe('BrowserRouter (jsx)', () => {
     const node = document.createElement('div');
     const history = {};
 
-    spyOn(console, 'error');
+    const consoleSpy = spyOn(console, 'error');
 
     // @ts-ignore
     render(<BrowserRouter history={history} />, node);
 
-    expect(console.error).toHaveBeenCalledTimes(1);
+    expect(consoleSpy).toHaveBeenCalledTimes(1);
 
     // browser only?
-    expect((console.error as any).calls.argsFor(0)[0]).toContain('<BrowserRouter> ignores the history prop');
+    expect(consoleSpy.calls.argsFor(0)[0]).toContain('<BrowserRouter> ignores the history prop');
 
     // node only?
-    //expect(console.error).toHaveBeenCalledWith(
+    // expect(console.error).toHaveBeenCalledWith(
     //  expect.stringContaining('<BrowserRouter> ignores the history prop')
-    //)
+    // )
   });
 });
diff --git a/packages/inferno-router/__tests__/HashRouter.spec.tsx b/packages/inferno-router/__tests__/HashRouter.spec.tsx
@@ -26,12 +26,12 @@ describe('A <HashRouter>', () => {
     const history = {};
     const node = document.createElement('div');
 
-    spyOn(console, 'error');
+    const consoleSpy = spyOn(console, 'error');
 
     // @ts-ignore
     render(<HashRouter history={history} />, node);
 
-    expect(console.error).toHaveBeenCalledTimes(1);
-    expect((console.error as any).calls.argsFor(0)[0]).toContain('<HashRouter> ignores the history prop');
+    expect(consoleSpy).toHaveBeenCalledTimes(1);
+    expect(consoleSpy.calls.argsFor(0)[0]).toContain('<HashRouter> ignores the history prop');
   });
 });
diff --git a/packages/inferno-router/__tests__/MemoryRouter.spec.tsx b/packages/inferno-router/__tests__/MemoryRouter.spec.tsx
@@ -43,13 +43,13 @@ describe('A <MemoryRouter>', () => {
     const history = {};
     const node = document.createElement('div');
 
-    spyOn(console, 'error');
+    const consoleSpy = spyOn(console, 'error');
 
     // @ts-ignore
     render(<MemoryRouter history={history} />, node);
 
-    expect(console.error).toHaveBeenCalledTimes(1);
-    expect((console.error as any).calls.argsFor(0)[0]).toContain('<MemoryRouter> ignores the history prop');
+    expect(consoleSpy).toHaveBeenCalledTimes(1);
+    expect(consoleSpy.calls.argsFor(0)[0]).toContain('<MemoryRouter> ignores the history prop');
   });
 
   it('Should be possible to render multiple sub routes, Github #1360', () => {

diff --git a/packages/inferno/__tests__/forward-ref.spec.tsx b/packages/inferno/__tests__/forward-ref.spec.tsx
@@ -128,48 +128,48 @@ describe('Forward Ref', () => {
 
   describe('Validations', () => {
     it('Should log error if input is: Component, vNode or invalid value', () => {
-      const spy = spyOn(console, 'error');
+      const consoleSpy = spyOn(console, 'error');
 
       class Foobar extends Component {}
 
       let i = 0;
 
       // @ts-expect-error
       forwardRef(false);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // @ts-expect-error
       forwardRef(true);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // @ts-expect-error
       forwardRef({});
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // @ts-expect-error
       forwardRef('asd');
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // @ts-expect-error
       forwardRef(undefined);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // @ts-expect-error
       forwardRef(8);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // TODO: improve forward ref typings
       forwardRef(<div>1</div>);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       forwardRef(<Foobar />);
-      expect(spy.calls.count()).toEqual(++i);
+      expect(consoleSpy.calls.count()).toEqual(++i);
 
       // This is ok
       forwardRef(function () {
         return <div>1</div>;
       });
-      expect(spy.calls.count()).toEqual(i);
+      expect(consoleSpy.calls.count()).toEqual(i);
     });
   });
 

diff --git a/packages/inferno/__tests__/link.spec.tsx b/packages/inferno/__tests__/link.spec.tsx
@@ -17,37 +17,37 @@ describe('Links', () => {
 
   describe('javascript href', function () {
     it('Should log warning when rendering link starting with javascript::', function () {
-      spyOn(console, 'error');
+      const consoleSpy = spyOn(console, 'error');
 
       render(<a href="javascript:foobar">test</a>, container);
 
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error).toHaveBeenCalledWith(
+      expect(consoleSpy).toHaveBeenCalledTimes(1);
+      expect(consoleSpy).toHaveBeenCalledWith(
         'Rendering links with javascript: URLs is not recommended. Use event handlers instead if you can. Inferno was passed "javascript:foobar".'
       );
       expect(container.innerHTML).toEqual('<a href="javascript:foobar">test</a>');
     });
 
     it('Should allow patching link to null', function () {
-      spyOn(console, 'error');
+      const consoleSpy = spyOn(console, 'error');
 
       render(<a href="javascript:foobar">test</a>, container);
 
-      expect(console.error).toHaveBeenCalledTimes(1);
+      expect(consoleSpy).toHaveBeenCalledTimes(1);
 
       render(<a>test</a>, container);
 
-      expect(console.error).toHaveBeenCalledTimes(1);
+      expect(consoleSpy).toHaveBeenCalledTimes(1);
 
       expect(container.innerHTML).toEqual('<a>test</a>');
     });
 
     it('Should not log warning when rendering regular link', function () {
-      spyOn(console, 'error');
+      const consoleSpy = spyOn(console, 'error');
 
       render(<a href="https://github.com/infernojs/inferno">test</a>, container);
 
-      expect(console.error).toHaveBeenCalledTimes(0);
+      expect(consoleSpy).toHaveBeenCalledTimes(0);
       expect(container.innerHTML).toEqual('<a href="https://github.com/infernojs/inferno">test</a>');
     });
   });

diff --git a/packages/inferno/__tests__/rendering.spec.tsx b/packages/inferno/__tests__/rendering.spec.tsx
@@ -99,19 +99,19 @@ describe('rendering routine', () => {
   });
 
   it('should not warn when rendering into an empty container', () => {
-    const spy = spyOn(console, 'error');
+    const consoleSpy = spyOn(console, 'error');
 
     render(<div>foo</div>, container);
     expect(container.innerHTML).toBe('<div>foo</div>');
 
     render(null, container);
     expect(container.innerHTML).toBe('');
-    expect(spy.calls.count()).toBe(0);
+    expect(consoleSpy.calls.count()).toBe(0);
 
     render(<div>bar</div>, container);
     expect(container.innerHTML).toBe('<div>bar</div>');
 
-    expect(spy.calls.count()).toBe(0);
+    expect(consoleSpy.calls.count()).toBe(0);
   });
 
   it('Should be possible to render Immutable datastructures', () => {
@@ -121,7 +121,7 @@ describe('rendering routine', () => {
       return <div>{array}</div>;
     }
 
-    const spy = spyOn(console, 'error');
+    const consoleSpy = spyOn(console, 'error');
 
     render(<Clock time={1} />, container);
     expect(container.innerHTML).toBe('<div><span>Inferno version:</span><br><span>2</span></div>');
@@ -131,12 +131,12 @@ describe('rendering routine', () => {
 
     render(<Clock time={3} />, container);
     expect(container.innerHTML).toBe('<div><span>Inferno version:</span><br><span>4</span></div>');
-    expect(spy.calls.count()).toBe(0);
+    expect(consoleSpy.calls.count()).toBe(0);
 
     render(null, container);
     expect(container.innerHTML).toBe('');
 
-    expect(spy.calls.count()).toBe(0);
+    expect(consoleSpy.calls.count()).toBe(0);
   });
 
   describe('createTextVNode', () => {