From 8d1df2767bd4b0bfb9aabe15f270455cbdf1fdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 3 Apr 2020 22:54:17 +0200 Subject: [PATCH 1/2] chore: bump RN to 0.62 --- .flowconfig | 5 +- package.json | 8 +- src/__tests__/a11yAPI.test.js | 2 + yarn.lock | 655 ++++++++++++++++------------------ 4 files changed, 309 insertions(+), 361 deletions(-) diff --git a/.flowconfig b/.flowconfig index 405e5ead3..b253bbb8c 100644 --- a/.flowconfig +++ b/.flowconfig @@ -21,7 +21,7 @@ node_modules/warning/.* [include] [libs] -node_modules/react-native/Libraries/react-native/react-native-interface.js +node_modules/react-native/interface.js node_modules/react-native/flow/ flow-typed @@ -38,9 +38,8 @@ module.file_ext=.ios.js munge_underscores=true -module.name_mapper='^react-native$' -> '/node_modules/react-native/Libraries/react-native/react-native-implementation' module.name_mapper='^react-native/\(.*\)$' -> '/node_modules/react-native/\1' -module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/node_modules/react-native/Libraries/Image/RelativeImageStub' +module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/node_modules/react-native/Libraries/Image/RelativeImageStub' suppress_type=$FlowIssue suppress_type=$FlowFixMe diff --git a/package.json b/package.json index 37c9208c1..0f921a4ab 100644 --- a/package.json +++ b/package.json @@ -19,19 +19,19 @@ "@babel/core": "^7.8.7", "@callstack/eslint-config": "^9.1.0", "@release-it/conventional-changelog": "^1.1.0", - "@types/react": "^16.9.23", - "@types/react-native": "^0.61.23", + "@types/react": "^16.9.34", + "@types/react-native": "^0.62.2", "@types/react-test-renderer": "^16.9.2", "babel-jest": "^25.1.0", "conventional-changelog-cli": "^2.0.11", "dedent": "^0.7.0", "eslint": "^6.8.0", - "flow-bin": "^0.107.0", + "flow-bin": "^0.116.0", "flow-copy-source": "^2.0.6", "jest": "^25.1.0", "metro-react-native-babel-preset": "^0.58.0", "react": "^16.13.0", - "react-native": "^0.61.5", + "react-native": "^0.62.2", "react-test-renderer": "^16.13.0", "release-it": "^12.3.3", "strip-ansi": "^5.2.0", diff --git a/src/__tests__/a11yAPI.test.js b/src/__tests__/a11yAPI.test.js index 6a31a0111..69d0ddce4 100644 --- a/src/__tests__/a11yAPI.test.js +++ b/src/__tests__/a11yAPI.test.js @@ -21,6 +21,7 @@ const Typography = ({ children, ...rest }: any) => { class Button extends React.Component { render() { return ( + // $FlowFixMe - accessibilityStates removed in RN 0.62 =0.0.5" ultron "1.0.x" -ws@^3.3.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" - dependencies: - async-limiter "~1.0.0" - safe-buffer "~5.1.0" - ultron "~1.1.0" +ws@^7: + version "7.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz#a5411e1fb04d5ed0efee76d26d5c46d830c39b46" + integrity sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ== ws@^7.0.0: version "7.2.1" @@ -9690,10 +9640,6 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -9733,6 +9679,14 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^15.0.1: + version "15.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" + integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^16.1.0: version "16.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" @@ -9741,12 +9695,6 @@ yargs-parser@^16.1.0: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - dependencies: - camelcase "^4.1.0" - yargs@^12.0.5: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" @@ -9781,6 +9729,23 @@ yargs@^13.1.0: y18n "^4.0.0" yargs-parser "^13.1.1" +yargs@^14.2.0: + version "14.2.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" + integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg== + dependencies: + cliui "^5.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^15.0.1" + yargs@^15.0.0: version "15.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" @@ -9797,21 +9762,3 @@ yargs@^15.0.0: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^16.1.0" - -yargs@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c" - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" From 4261a32a96e6f18585eb2fcd2d3c3f85ca01ca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 17 Apr 2020 09:07:00 +0200 Subject: [PATCH 2/2] disable accessibilityStates tests; fixups --- .../__snapshots__/debug.test.js.snap | 35 ++++++------ .../__snapshots__/render.test.js.snap | 54 +++++++++---------- src/__tests__/a11yAPI.test.js | 6 ++- src/__tests__/fireEvent.test.js | 16 ++---- 4 files changed, 48 insertions(+), 63 deletions(-) diff --git a/src/__tests__/__snapshots__/debug.test.js.snap b/src/__tests__/__snapshots__/debug.test.js.snap index 74be14b39..b1732ecc6 100644 --- a/src/__tests__/__snapshots__/debug.test.js.snap +++ b/src/__tests__/__snapshots__/debug.test.js.snap @@ -1,28 +1,26 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`debug 1`] = ` -" -" +" `; exports[`debug.deep 1`] = ` " not fresh - - not fresh - - { expect(queryAllByA11yRole(NO_MATCHES_TEXT)).toEqual([]); }); -test('getByA11yStates, queryByA11yStates', () => { +// TODO: accessibilityStates was removed from RN 0.62 +test.skip('getByA11yStates, queryByA11yStates', () => { const { getByA11yStates, queryByA11yStates } = render(
); expect(getByA11yStates('disabled').props.accessibilityStates).toEqual([ @@ -157,7 +158,8 @@ test('getByA11yStates, queryByA11yStates', () => { expect(() => queryByA11yStates('selected')).toThrow(FOUND_TWO_INSTANCES); }); -test('getAllByA11yStates, queryAllByA11yStates', () => { +// TODO: accessibilityStates was removed from RN 0.62 +test.skip('getAllByA11yStates, queryAllByA11yStates', () => { const { getAllByA11yStates, queryAllByA11yStates } = render(
); expect(getAllByA11yStates('selected')).toHaveLength(3); diff --git a/src/__tests__/fireEvent.test.js b/src/__tests__/fireEvent.test.js index d98e1f644..3301dae34 100644 --- a/src/__tests__/fireEvent.test.js +++ b/src/__tests__/fireEvent.test.js @@ -57,7 +57,9 @@ describe('fireEvent', () => { }); test('should throw an Error when event handler was not found', () => { - const { getByTestId } = render(); + const { getByTestId } = render( + 'this is not passed to children'} /> + ); expect(() => fireEvent(getByTestId('text'), 'press')).toThrow( 'No handler function found for event: "press"' @@ -78,18 +80,6 @@ describe('fireEvent', () => { expect(handlerMock).toHaveBeenCalledWith(EVENT_DATA); }); - - test('should not bubble event to root element', () => { - const onPressMock = jest.fn(); - const { getByTestId } = render( - - Content - - ); - - expect(() => fireEvent.press(getByTestId('test'))).toThrow(); - expect(onPressMock).not.toHaveBeenCalled(); - }); }); test('fireEvent.press', () => {