@cratis/arc.react 18.5.0 → 18.7.0

package/identity/for_IdentityProvider/when_refreshing_identity.ts

@@ -6,7 +6,7 @@ import { render } from '@testing-library/react';
 import { IdentityProvider } from '../IdentityProvider';
 import { useIdentity } from '../useIdentity';
 import { IIdentity } from '@cratis/arc/identity';
-import sinon from 'sinon';
+import { createFetchHelper } from '@cratis/arc/helpers/fetchHelper';
 
 describe('when refreshing identity', async () => {
     let capturedIdentity: IIdentity | null = null;
@@ -22,7 +22,8 @@ describe('when refreshing identity', async () => {
         return React.createElement('div', null, 'Test');
     };
 
-    const mockFetch = sinon.stub(global, 'fetch');
+    const fetchHelper = createFetchHelper();
+    const mockFetch = fetchHelper.stubFetch();
     mockFetch.onFirstCall().resolves({
         json: async () => ({
             id: 'initial-id',
@@ -55,5 +56,5 @@ describe('when refreshing identity', async () => {
     it('should have new id', () => newId.should.equal('new-id'));
     it('should have new name', () => newName.should.equal('Updated User'));
 
-    mockFetch.restore();
+    fetchHelper.restore();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/arc.react",
-    "version": "18.5.0",
+    "version": "18.7.0",
     "description": "",
     "author": "Cratis",
     "license": "MIT",
@@ -59,7 +59,7 @@
         "up": "yarn g:up"
     },
     "dependencies": {
-        "@cratis/arc": "18.5.0",
+        "@cratis/arc": "18.7.0",
         "tsyringe": "^4.10.0"
     },
     "peerDependencies": {

package/queries/for_useObservableQuery/when_creating_instance.ts

@@ -78,7 +78,7 @@ describe('when creating instance', () => {
         callback!.should.not.be.undefined;
 
         await act(async () => {
-            callback({
+            callback(new QueryResult({
                 data: [{ id: '1', name: 'Test' }],
                 isSuccess: true,
                 isAuthorized: true,
@@ -88,7 +88,7 @@ describe('when creating instance', () => {
                 exceptionMessages: [],
                 exceptionStackTrace: '',
                 paging: { page: 0, size: 0, totalItems: 0, totalPages: 0 }
-            } as QueryResult<any[]>);
+            }, Array, true));
         });
 
         capturedIsPerformingInitial!.should.be.true;

package/queries/for_useQuery/when_creating_instance.ts

@@ -7,11 +7,13 @@ import sinon from 'sinon';
 import { useQuery } from '../useQuery';
 import { FakeQuery } from './FakeQuery';
 import { ArcContext, ArcConfiguration } from '../../ArcContext';
+import { createFetchHelper } from '@cratis/arc/helpers/fetchHelper';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 describe('when creating instance', () => {
     let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
     let queryInstance: FakeQuery | null = null;
 
     const captureInstance = (instance: FakeQuery) => {
@@ -19,13 +21,15 @@ describe('when creating instance', () => {
     };
 
     beforeEach(() => {
-        fetchStub = sinon.stub(global, 'fetch').resolves({
+        fetchHelper = createFetchHelper();
+        fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
             json: async () => ({ data: [], isSuccess: true, isAuthorized: true, isValid: true, hasExceptions: false, validationResults: [], exceptionMessages: [], exceptionStackTrace: '' })
         } as Response);
     });
 
     afterEach(() => {
-        fetchStub.restore();
+        fetchHelper.restore();
     });
 
     const config: ArcConfiguration = {

package/queries/for_useQuery/when_creating_instance_with_sorting.ts

@@ -3,14 +3,14 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import sinon from 'sinon';
 import { useQuery } from '../useQuery';
 import { FakeQuery } from './FakeQuery';
 import { ArcContext, ArcConfiguration } from '../../ArcContext';
 import { Sorting } from '@cratis/arc/queries';
+import { createFetchHelper } from '@cratis/arc/helpers/fetchHelper';
 
 describe('when creating instance with sorting', () => {
-    let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
     let queryInstance: FakeQuery | null = null;
 
     const captureInstance = (instance: FakeQuery) => {
@@ -18,13 +18,15 @@ describe('when creating instance with sorting', () => {
     };
 
     beforeEach(() => {
-        fetchStub = sinon.stub(global, 'fetch').resolves({
+        fetchHelper = createFetchHelper();
+        const fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
             json: async () => ({ data: [], isSuccess: true, isAuthorized: true, isValid: true, hasExceptions: false, validationResults: [], exceptionMessages: [], exceptionStackTrace: '' })
         } as Response);
     });
 
     afterEach(() => {
-        fetchStub.restore();
+        fetchHelper.restore();
     });
 
     const config: ArcConfiguration = {

package/queries/for_useQuery/when_creating_instance_without_optional_context_values.ts

@@ -7,11 +7,13 @@ import sinon from 'sinon';
 import { useQuery } from '../useQuery';
 import { FakeQuery } from './FakeQuery';
 import { ArcContext, ArcConfiguration } from '../../ArcContext';
+import { createFetchHelper } from '@cratis/arc/helpers/fetchHelper';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 describe('when creating instance without optional context values', () => {
     let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
     let queryInstance: FakeQuery | null = null;
 
     const captureInstance = (instance: FakeQuery) => {
@@ -19,13 +21,15 @@ describe('when creating instance without optional context values', () => {
     };
 
     beforeEach(() => {
-        fetchStub = sinon.stub(global, 'fetch').resolves({
+        fetchHelper = createFetchHelper();
+        fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
             json: async () => ({ data: [], isSuccess: true, isAuthorized: true, isValid: true, hasExceptions: false, validationResults: [], exceptionMessages: [], exceptionStackTrace: '' })
         } as Response);
     });
 
     afterEach(() => {
-        fetchStub.restore();
+        fetchHelper.restore();
     });
 
     const config: ArcConfiguration = {

package/queries/for_useQueryWithPaging/when_creating_instance_with_paging.ts

@@ -8,11 +8,13 @@ import { useQueryWithPaging } from '../useQuery';
 import { FakeQuery } from '../for_useQuery/FakeQuery';
 import { ArcContext, ArcConfiguration } from '../../ArcContext';
 import { Paging } from '@cratis/arc/queries';
+import { createFetchHelper } from '@cratis/arc/helpers/fetchHelper';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 describe('when creating instance with paging', () => {
     let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
     let queryInstance: FakeQuery | null = null;
 
     const captureInstance = (instance: FakeQuery) => {
@@ -20,13 +22,15 @@ describe('when creating instance with paging', () => {
     };
 
     beforeEach(() => {
-        fetchStub = sinon.stub(global, 'fetch').resolves({
+        fetchHelper = createFetchHelper();
+        fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
             json: async () => ({ data: [], isSuccess: true, isAuthorized: true, isValid: true, hasExceptions: false, validationResults: [], exceptionMessages: [], exceptionStackTrace: '' })
         } as Response);
     });
 
     afterEach(() => {
-        fetchStub.restore();
+        fetchHelper.restore();
     });
 
     const config: ArcConfiguration = {