cozy-client 51.3.0 → 51.4.0

package/dist/CozyClient.js

@@ -2607,32 +2607,26 @@ var CozyClient = /*#__PURE__*/function () {
     key: "loadInstanceOptionsFromStack",
     value: function () {
       var _loadInstanceOptionsFromStack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
-        var _yield$this$query, data, _yield$this$query2, instanceData;
-
+        var results, capabilitiesData, instanceData;
         return _regenerator.default.wrap(function _callee20$(_context20) {
           while (1) {
             switch (_context20.prev = _context20.next) {
               case 0:
                 _context20.next = 2;
-                return this.query((0, _dsl.Q)('io.cozy.settings').getById('io.cozy.settings.capabilities'));
+                return Promise.all([this.query((0, _dsl.Q)('io.cozy.settings').getById('io.cozy.settings.capabilities')), this.query((0, _dsl.Q)('io.cozy.settings').getById('io.cozy.settings.instance'))]);
 
               case 2:
-                _yield$this$query = _context20.sent;
-                data = _yield$this$query.data;
-                _context20.next = 6;
-                return this.query((0, _dsl.Q)('io.cozy.settings').getById('io.cozy.settings.instance'));
-
-              case 6:
-                _yield$this$query2 = _context20.sent;
-                instanceData = _yield$this$query2.data;
+                results = _context20.sent;
+                capabilitiesData = results[0].data;
+                instanceData = results[1].data;
                 this.instanceOptions = {
-                  capabilities: data,
+                  capabilities: capabilitiesData,
                   locale: instanceData.locale,
                   tracking: instanceData.tracking
                 };
                 this.capabilities = this.instanceOptions.capabilities || null;
 
-              case 10:
+              case 7:
               case "end":
                 return _context20.stop();
             }
@@ -3032,7 +3026,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "51.3.0";
+CozyClient.version = "51.4.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/Provider.spec.jsx

@@ -3,7 +3,7 @@ jest.mock('./CozyClient')
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import configureStore from 'redux-mock-store'
-import { mount, shallow } from 'enzyme'
+import { fireEvent, render } from '@testing-library/react'
 
 import Provider from './Provider'
 import CozyClient from './CozyClient'
@@ -13,12 +13,12 @@ describe('Provider', () => {
   const store = configureStore()({})
 
   it('should renders children when passed in', () => {
-    const wrapper = shallow(
+    const wrapper = render(
       <Provider client={client} store={store}>
-        <div className="unique" />
+        <div>Component</div>
       </Provider>
     )
-    expect(wrapper.contains(<div className="unique" />)).toBe(true)
+    expect(wrapper.getByText('Component')).toBeTruthy()
   })
 
   it('should provide the client in the context', () => {
@@ -33,12 +33,12 @@ describe('Provider', () => {
         return <button onClick={this.onClick} />
       }
     }
-    const wrapper = mount(
+    const wrapper = render(
       <Provider client={client} store={store}>
         <FakeComponent />
       </Provider>
     )
-    wrapper.find('button').simulate('click')
+    fireEvent.click(wrapper.getByRole('button'))
     expect(client.query).toHaveBeenCalledWith('foo')
   })
 })

package/dist/Query.spec.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { mount } from 'enzyme'
+import { screen, render } from '@testing-library/react'
 import CozyProvider from './Provider'
 
 import Query from './Query'
@@ -34,17 +34,24 @@ describe('Query', () => {
 
   describe('lifecycle', () => {
     it('should fire a query fetch when mounted', () => {
-      mount(<Query query={queryDef}>{() => null}</Query>, {
-        context
-      })
+      render(
+        <CozyProvider client={client}>
+          <Query query={queryDef}>{() => null}</Query>
+        </CozyProvider>,
+        {
+          context
+        }
+      )
       expect(observableQuery.fetch).toHaveBeenCalled()
     })
 
     it('should not fire a query fetch when mounted if enabled is set to false', () => {
-      mount(
-        <Query query={queryDef} enabled={false}>
-          {() => null}
-        </Query>,
+      render(
+        <CozyProvider client={client}>
+          <Query query={queryDef} enabled={false}>
+            {() => null}
+          </Query>
+        </CozyProvider>,
         {
           context
         }
@@ -56,10 +63,12 @@ describe('Query', () => {
       const queryState = { lastUpdate: Date.now() }
       client.getQueryFromState = jest.fn().mockReturnValue(queryState)
       const fetchPolicy = jest.fn().mockReturnValue(false)
-      mount(
-        <Query query={queryDef} as="allTodos" fetchPolicy={fetchPolicy}>
-          {() => null}
-        </Query>,
+      render(
+        <CozyProvider client={client}>
+          <Query query={queryDef} as="allTodos" fetchPolicy={fetchPolicy}>
+            {() => null}
+          </Query>
+        </CozyProvider>,
         { context }
       )
       expect(client.getQueryFromState).toHaveBeenCalledWith('allTodos')
@@ -72,7 +81,7 @@ describe('Query', () => {
       const store = assets.store
       const client = assets.client
       const spy = jest.spyOn(store, 'dispatch')
-      mount(
+      render(
         <CozyProvider client={client}>
           <Query query={queryDef}>{() => null}</Query>
         </CozyProvider>
@@ -97,14 +106,14 @@ describe('Query', () => {
   })
 
   describe('data reactions', () => {
-    let store, client, uut
+    let store, client
     beforeEach(async () => {
       const assets = createTestAssets()
       store = assets.store
       client = assets.client
       const noFetch = () => false
       await store.dispatch(initQuery('allTodos', queryDef(client)))
-      uut = mount(
+      render(
         <CozyProvider client={client}>
           <Query fetchPolicy={noFetch} query={queryDef}>
             {({ data }) => (
@@ -120,11 +129,11 @@ describe('Query', () => {
     })
 
     it('should be refreshed when relevant results are updated', async () => {
-      expect(uut.html()).not.toContain('Build stuff')
+      expect(screen.queryByText('Build stuff')).not.toBeInTheDocument()
       const response = queryResultFromData(TODOS)
       const action = receiveQueryResult('allTodos', response)
       await store.dispatch(action)
-      expect(uut.html()).toContain('Build stuff')
+      expect(screen.queryByText('Build stuff')).toBeInTheDocument()
     })
 
     it('should refresh queries concerned by a REMOVE_REFERENCE_TO mutation', async () => {
@@ -166,7 +175,7 @@ describe('Query', () => {
 
     const setup = ({ children }) => {
       const noFetch = () => false
-      mount(
+      render(
         <CozyProvider client={client}>
           <Query fetchPolicy={noFetch} query={queryDef}>
             {children}
@@ -239,7 +248,7 @@ describe('Query', () => {
 
       const noFetch = () => false
 
-      mount(
+      render(
         <CozyProvider client={client}>
           <Query fetchPolicy={noFetch} query={queryDef} mutations={mutations}>
             {(result, mutations) => {
@@ -269,7 +278,7 @@ describe('Query', () => {
 
       const noFetch = () => false
 
-      mount(
+      render(
         <CozyProvider client={client}>
           <Query fetchPolicy={noFetch} query={queryDef} mutations={mutations}>
             {(result, mutations) => {

package/dist/__tests__/setup.js

@@ -2,14 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _enzyme = _interopRequireDefault(require("enzyme"));
-
-var _enzymeAdapterReact = _interopRequireDefault(require("enzyme-adapter-react-16"));
-
 var _whatwgFetch = _interopRequireDefault(require("whatwg-fetch"));
 
-global.fetch = _whatwgFetch.default;
-
-_enzyme.default.configure({
-  adapter: new _enzymeAdapterReact.default()
-});
+global.fetch = _whatwgFetch.default;

package/dist/hoc.spec.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { Provider as ReduxProvider } from 'react-redux'
-import { mount } from 'enzyme'
+import { fireEvent, render, screen } from '@testing-library/react'
 
 import { withClient, queryConnect, queryConnectFlat } from './hoc'
 import { Q } from './queries/dsl'
@@ -12,17 +12,15 @@ import { setupClient } from './testing/utils'
 
 beforeEach(() => {
   jest.spyOn(logger, 'warn').mockImplementation(() => {})
+  Component.mockClear()
 })
 
 afterEach(() => {
   logger.warn.mockRestore()
 })
 
-class Component extends React.Component {
-  render() {
-    return <div />
-  }
-}
+const Component = jest.fn(() => <div>Component</div>)
+Component.displayName = 'Component'
 
 describe('with client', () => {
   it('should give a display name', () => {
@@ -38,12 +36,13 @@ describe('with client', () => {
       getState: jest.fn()
     }
     const WithClientComponent = withClient(Component)
-    const uut = mount(
+    render(
       <Provider client={client} store={store}>
         <WithClientComponent />
       </Provider>
     )
-    expect(uut.find(Component).prop('client')).toBe(client)
+
+    expect(Component).toHaveBeenCalledWith({ client }, {})
   })
 })
 
@@ -75,19 +74,23 @@ describe('queryConnect', () => {
     const context = {
       client
     }
-    const uut = mount(<WithQueries />, { context })
-    expect(
-      uut
-        .find(Component)
-        .prop('simpsons')
-        .data.map(x => x.name)
-    ).toEqual(['Homer', 'Marge'])
-    expect(
-      uut
-        .find(Component)
-        .prop('upperSimpsons')
-        .data.map(x => x.name)
-    ).toEqual(['HOMER', 'MARGE'])
+    render(
+      <Provider client={client}>
+        <WithQueries />
+      </Provider>,
+      { context }
+    )
+
+    const propsPassedToComponent = Component.mock.calls[0][0]
+
+    expect(propsPassedToComponent.simpsons.data.map(x => x.name)).toEqual([
+      'Homer',
+      'Marge'
+    ])
+    expect(propsPassedToComponent.upperSimpsons.data.map(x => x.name)).toEqual([
+      'HOMER',
+      'MARGE'
+    ])
   })
 
   it('should be possible to pass props', () => {
@@ -109,20 +112,23 @@ describe('queryConnect', () => {
         </Provider>
       )
     }
-    const uut = mount(<Wrapper client={client} />)
-    const props = uut.find('Query').props()
-    expect(props.query).toEqual(
+
+    render(<Wrapper client={client} />)
+
+    expect(Component).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: 'marge'
-      })
+        simpsonId: 'marge'
+      }),
+      {}
     )
-    uut.find('button').simulate('click')
-    uut.update()
-    const props2 = uut.find('Query').props()
-    expect(props2.query).toEqual(
+
+    fireEvent.click(screen.getByText('change to homer'))
+
+    expect(Component).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: 'homer'
-      })
+        simpsonId: 'homer'
+      }),
+      {}
     )
   })
 })
@@ -144,38 +150,22 @@ describe('queryConnectFlat', () => {
 
   it('should pass result of query definitions as props', () => {
     const { WithQueries, client } = setup()
-    const uut = mount(
+    render(
       <ReduxProvider store={client.store}>
         <Provider client={client}>
           <WithQueries />
         </Provider>
       </ReduxProvider>
     )
-    expect(
-      uut
-        .find(Component)
-        .prop('simpsons')
-        .data.map(x => x.name)
-    ).toEqual(['Homer', 'Marge'])
-    expect(
-      uut
-        .find(Component)
-        .prop('upperSimpsons')
-        .data.map(x => x.name)
-    ).toEqual(['HOMER', 'MARGE'])
-  })
+    const propsPassedToComponent = Component.mock.calls[0][0]
 
-  it('should have Component as direct children of queryConnectFlag', () => {
-    const { WithQueries, client } = setup()
-    const uut = mount(
-      <ReduxProvider store={client.store}>
-        <Provider client={client}>
-          <WithQueries />
-        </Provider>
-      </ReduxProvider>
-    )
-    const queryConnectFlatComponent = uut.find('queryConnectFlat(Component)')
-    expect(queryConnectFlatComponent.length).toBe(1)
-    expect(queryConnectFlatComponent.children().is('Component')).toBe(true)
+    expect(propsPassedToComponent.simpsons.data.map(x => x.name)).toEqual([
+      'Homer',
+      'Marge'
+    ])
+    expect(propsPassedToComponent.upperSimpsons.data.map(x => x.name)).toEqual([
+      'HOMER',
+      'MARGE'
+    ])
   })
 })

package/dist/hooks/useClient.spec.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import useClient from './useClient'
 import Provider from '../Provider'
-import { mount } from 'enzyme'
+import { screen, render } from '@testing-library/react'
 
 describe('useClient', () => {
   const Component = () => {
@@ -10,11 +10,12 @@ describe('useClient', () => {
   }
   it('should get the client from the nearest Provider', () => {
     const client = { stackClient: { uri: 'https://test.mycozy.cloud' } }
-    const root = mount(
+    render(
       <Provider client={client}>
         <Component />
       </Provider>
     )
-    expect(root.html()).toBe('<div>https://test.mycozy.cloud</div>')
+
+    screen.getByText('https://test.mycozy.cloud')
   })
 })

package/dist/withMutation.spec.jsx

@@ -1,9 +1,10 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { fireEvent, render } from '@testing-library/react'
 
 import CozyClient from './CozyClient'
 import CozyLink from './CozyLink'
 import withMutation from './withMutation'
+import Provider from './Provider'
 
 describe('withMutation', () => {
   const NEW_TODO = {
@@ -25,11 +26,12 @@ describe('withMutation', () => {
     )
     const ConnectedAddButton = withMutation(mutationCreator)(AddButton)
 
-    const wrapper = shallow(<ConnectedAddButton />, { context: { client } })
-    wrapper
-      .dive()
-      .find('button')
-      .simulate('click')
+    const wrapper = render(
+      <Provider client={client}>
+        <ConnectedAddButton />
+      </Provider>
+    )
+    fireEvent.click(wrapper.getByRole('button'))
 
     expect(mutationCreator).toHaveBeenCalledWith(NEW_TODO)
   })
@@ -42,11 +44,12 @@ describe('withMutation', () => {
       name: 'addTodo'
     })(AddButton)
 
-    const wrapper = shallow(<ConnectedAddButton />, { context: { client } })
-    wrapper
-      .dive()
-      .find('button')
-      .simulate('click')
+    const wrapper = render(
+      <Provider client={client}>
+        <ConnectedAddButton />
+      </Provider>
+    )
+    fireEvent.click(wrapper.getByRole('button'))
 
     expect(mutationCreator).toHaveBeenCalledWith(NEW_TODO)
   })

package/dist/withMutations.spec.jsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render } from '@testing-library/react'
 
 import withMutations from './withMutations'
+import Provider from './Provider'
 
 describe('withMutations', () => {
   beforeEach(() => {
@@ -49,21 +50,29 @@ describe('withMutations', () => {
 
     expect(() => {
       const ConnectedFoo = withMutations(mutationsMock)(Foo)
-      shallow(<ConnectedFoo />, {
-        context: { client: clientMock }
-      })
+      render(
+        <Provider client={clientMock}>
+          <ConnectedFoo />
+        </Provider>
+      )
     }).not.toThrowError()
   })
 
   it('should inject base mutations props into wrapped component', async () => {
-    const Foo = () => <div />
+    const Foo = jest.fn(() => <div>Component</div>)
     const ConnectedFoo = withMutations()(Foo)
 
-    const wrapper = shallow(<ConnectedFoo />, {
-      context: { client: clientMock }
-    })
+    render(
+      <Provider client={clientMock}>
+        <ConnectedFoo />
+      </Provider>
+    )
 
-    const { createDocument, saveDocument, deleteDocument } = wrapper.props()
+    const {
+      createDocument,
+      saveDocument,
+      deleteDocument
+    } = Foo.mock.calls[0][0]
 
     expect(typeof createDocument).toBe('function')
     expect(typeof saveDocument).toBe('function')
@@ -71,17 +80,18 @@ describe('withMutations', () => {
   })
 
   it('should inject mutations props from one source into wrapped component', async () => {
-    const Foo = () => <div />
-
+    const Foo = jest.fn(() => <div>Component</div>)
     const ConnectedFoo = withMutations(client => ({
       mutate: client => client.mutate()
     }))(Foo)
 
-    const wrapper = shallow(<ConnectedFoo />, {
-      context: { client: clientMock }
-    })
+    render(
+      <Provider client={clientMock}>
+        <ConnectedFoo />
+      </Provider>
+    )
 
-    const { mutate } = wrapper.props()
+    const { mutate } = Foo.mock.calls[0][0]
     expect(typeof mutate).toBe('function')
 
     mutate(clientMock)
@@ -89,8 +99,7 @@ describe('withMutations', () => {
   })
 
   it('should inject mutations props from several sources into wrapped component', async () => {
-    const Foo = () => <div />
-
+    const Foo = jest.fn(() => <div>Component</div>)
     const mutations = client => ({
       mutate: client => client.mutate()
     })
@@ -101,11 +110,13 @@ describe('withMutations', () => {
 
     const ConnectedFoo = withMutations(mutations, anotherMutations)(Foo)
 
-    const wrapper = shallow(<ConnectedFoo />, {
-      context: { client: clientMock }
-    })
+    render(
+      <Provider client={clientMock}>
+        <ConnectedFoo />
+      </Provider>
+    )
 
-    const { mutate, mutateAsWell } = wrapper.props()
+    const { mutate, mutateAsWell } = Foo.mock.calls[0][0]
 
     expect(typeof mutate).toBe('function')
     expect(typeof mutateAsWell).toBe('function')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "51.3.0",
+  "version": "51.4.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -43,8 +43,9 @@
   "devDependencies": {
     "@babel/cli": "7.12.8",
     "@cozy/codemods": "1.14.4",
-    "@testing-library/react": "10.4.9",
-    "@testing-library/react-hooks": "3.7.0",
+    "@testing-library/jest-dom": "6.6.3",
+    "@testing-library/react": "12.1.5",
+    "@testing-library/react-hooks": "7.0.2",
     "babel-plugin-search-and-replace": "1.1.1",
     "btoa": "1.2.1",
     "cozy-device-helper": "2.7.0",
@@ -71,5 +72,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "d405ae287ab4514a2d0ff95be712882e28bcfeae"
+  "gitHead": "f13f75f38ad792fef00b574c27d46a99c0c294a2"
 }