From 348e68f338ca87481ca486dd49ca513a3359c3b0 Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Mon, 11 Jun 2018 15:39:40 -0700 Subject: [PATCH] Fix tests --- packages/drawer/example/yarn.lock | 81 +++++++++++++---------- packages/drawer/jest-setup.js | 28 +++----- packages/drawer/package.json | 4 +- packages/drawer/src/views/DrawerLayout.js | 2 + packages/drawer/src/views/DrawerView.js | 3 +- 5 files changed, 61 insertions(+), 57 deletions(-) create mode 100644 packages/drawer/src/views/DrawerLayout.js diff --git a/packages/drawer/example/yarn.lock b/packages/drawer/example/yarn.lock index e4b4a3c9..90b36e63 100644 --- a/packages/drawer/example/yarn.lock +++ b/packages/drawer/example/yarn.lock @@ -620,8 +620,8 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" arch@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.0.tgz#3613aa46149064b3c1f0607919bf1d4786e82889" + version "2.1.1" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" are-we-there-yet@~1.1.2: version "1.1.5" @@ -1514,8 +1514,8 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" big-integer@^1.6.7: - version "1.6.30" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.30.tgz#7796f04acdd6ba56345f19049c8fffd427f09d16" + version "1.6.31" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.31.tgz#6d7852486e67c642502dcc03f7225a245c9fc7fa" bluebird@^2.10.2: version "2.11.0" @@ -1844,10 +1844,10 @@ component-type@^1.2.1: resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9" compressible@~2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9" + version "2.0.14" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7" dependencies: - mime-db ">= 1.33.0 < 2" + mime-db ">= 1.34.0 < 2" compression@^1.7.1: version "1.7.2" @@ -2219,8 +2219,8 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" escodegen@1.x.x: - version "1.9.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" + version "1.10.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.10.0.tgz#f647395de22519fbd0d928ffcf1d17e0dec2603e" dependencies: esprima "^3.1.3" estraverse "^4.2.0" @@ -2902,8 +2902,8 @@ has-values@^1.0.0: kind-of "^4.0.0" has@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.2.tgz#1a64bfe4b52e67fb87b9822503d97c019fb6ba42" + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" dependencies: function-bind "^1.1.1" @@ -3922,14 +3922,18 @@ micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" +"mime-db@>= 1.34.0 < 2": + version "1.34.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a" mime-db@~1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" +mime-db@~1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + mime-types@2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" @@ -4351,8 +4355,8 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" dependencies: p-try "^1.0.0" @@ -4606,7 +4610,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@15.5.8, prop-types@15.6.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0: +prop-types@15.5.8, prop-types@15.6.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -4679,8 +4683,8 @@ range-parser@~1.2.0: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" raven-js@^3.17.0: - version "3.25.2" - resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.25.2.tgz#d3ad1c694f70855dda6f705204ee6ab76ba62884" + version "3.26.2" + resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.26.2.tgz#9153af2416e96ccf4e0b9cbc6c90c34dda0d7e88" raven@^2.1.1: version "2.6.2" @@ -4862,11 +4866,11 @@ react-native-tab-view@^0.0.77: dependencies: prop-types "^15.6.0" -react-native-tab-view@~0.0.78: - version "0.0.78" - resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.78.tgz#9b90730d89cbd34a03f0e0ab10e74ca7af945560" +react-native-tab-view@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.0.2.tgz#66e0bc6d38a227ed2b212e3a256b7902f6ce02ed" dependencies: - prop-types "^15.6.0" + prop-types "^15.6.1" react-native-vector-icons@4.5.0: version "4.5.0" @@ -4952,19 +4956,25 @@ react-navigation-deprecated-tab-navigator@1.3.0: dependencies: react-native-tab-view "^0.0.77" -react-navigation-tabs@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.3.0.tgz#b1fe7ef1c665dd8928fafcc8622616e220ae5efa" +react-navigation-drawer@0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-0.2.1.tgz#fed9b09a41ddfdc1ff198fad04a7b6051def8adf" + dependencies: + react-native-drawer-layout-polyfill "^1.3.2" + +react-navigation-tabs@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.5.1.tgz#ed33bce3a3e21b92646700de25bd94b8fc570371" dependencies: hoist-non-react-statics "^2.5.0" - prop-types "^15.6.0" + prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" react-native-safe-area-view "^0.7.0" - react-native-tab-view "~0.0.78" + react-native-tab-view "^1.0.0" react-navigation@^2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.0.4.tgz#efc09de09799c2117a54002a6ea0e9b80e92828d" + version "2.2.5" + resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.2.5.tgz#5c23091d2a87b63fe8d6be350d155664677b903c" dependencies: clamp "^1.0.1" create-react-context "^0.2.1" @@ -4972,10 +4982,10 @@ react-navigation@^2.0.1: path-to-regexp "^1.7.0" prop-types "^15.5.10" react-lifecycles-compat "^3" - react-native-drawer-layout-polyfill "^1.3.2" react-native-safe-area-view "^0.8.0" react-navigation-deprecated-tab-navigator "1.3.0" - react-navigation-tabs "0.3.0" + react-navigation-drawer "0.2.1" + react-navigation-tabs "0.5.1" react-prop-types-element-of-type@2.2.0: version "2.2.0" @@ -5304,7 +5314,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3": +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -5577,13 +5587,14 @@ split-string@^3.0.1, split-string@^3.0.2: extend-shallow "^3.0.0" sshpk@^1.7.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" + version "1.14.2" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" dashdash "^1.12.0" getpass "^0.1.1" + safer-buffer "^2.0.2" optionalDependencies: bcrypt-pbkdf "^1.0.0" ecc-jsbn "~0.1.1" diff --git a/packages/drawer/jest-setup.js b/packages/drawer/jest-setup.js index 5c38bf63..9d5fe5d9 100644 --- a/packages/drawer/jest-setup.js +++ b/packages/drawer/jest-setup.js @@ -6,21 +6,13 @@ import React from 'react'; -[ - 'react-native-drawer-layout-polyfill', - - // tests don't test the native bits, so just substitute the same - // fake polyfill for now - 'react-native-gesture-handler/DrawerLayout', -].forEach(module => { - jest.mock(module, () => { - const View = require.requireActual('View'); - class DrawerLayout extends View { - static positions = { - Left: 'left', - Right: 'right', - }; - } - return DrawerLayout; - }); -}) +jest.mock('./src/views/DrawerLayout', () => { + const View = require.requireActual('View'); + class DrawerLayout extends View { + static positions = { + Left: 'left', + Right: 'right', + }; + } + return DrawerLayout; +}); diff --git a/packages/drawer/package.json b/packages/drawer/package.json index c9d9298a..773a616d 100644 --- a/packages/drawer/package.json +++ b/packages/drawer/package.json @@ -33,9 +33,7 @@ "url": "https://github.com/react-navigation/react-navigation-drawer/issues" }, "homepage": "https://github.com/react-navigation/react-navigation-drawer#readme", - "dependencies": { - "react-native-drawer-layout-polyfill": "^1.3.2" - }, + "dependencies": {}, "devDependencies": { "@expo/vector-icons": "^6.2.0", "babel-cli": "^6.26.0", diff --git a/packages/drawer/src/views/DrawerLayout.js b/packages/drawer/src/views/DrawerLayout.js new file mode 100644 index 00000000..00489083 --- /dev/null +++ b/packages/drawer/src/views/DrawerLayout.js @@ -0,0 +1,2 @@ +import { DrawerLayout } from 'react-native-gesture-handler'; +export default DrawerLayout; diff --git a/packages/drawer/src/views/DrawerView.js b/packages/drawer/src/views/DrawerView.js index 2d1c5088..6d70f6a8 100644 --- a/packages/drawer/src/views/DrawerView.js +++ b/packages/drawer/src/views/DrawerView.js @@ -3,8 +3,9 @@ import { Dimensions } from 'react-native'; import { SceneView } from 'react-navigation'; import { DrawerLayout } from 'react-native-gesture-handler'; -import DrawerSidebar from './DrawerSidebar'; import DrawerActions from '../routers/DrawerActions'; +import DrawerLayout from './DrawerLayout'; +import DrawerSidebar from './DrawerSidebar'; /** * Component that renders the drawer.