diff --git a/README.md b/README.md index 1ed62534..e90d4c9f 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ npm run web ## e2e test -JS app code in `src/`write once run on Android, iOS and Web by react-native and react-web, now JS test case in `e2e/` with locator ~ write once run on them too, with [CodeceptJS](https://github.com/Codeception/CodeceptJS) and `npm run patch-codeceptjs-webdriverio`. +JS app code in `src/`write once run on Android, iOS and Web by react-native and react-web, now JS test case in `e2e/` with locator ~ write once run on them too with [CodeceptJS](https://github.com/Codeception/CodeceptJS) . ### Web test After install server side of test by `npm run e2e-update-server-web`, please run: ``` diff --git a/codecept.conf.js b/codecept.conf.js index b474e11b..7508639d 100644 --- a/codecept.conf.js +++ b/codecept.conf.js @@ -16,9 +16,6 @@ exports.config = { WebDriverIO: { url: 'http://localhost:3000', browser: 'chrome' - }, - ReactWeb: { - require: CODECEPT_WORK_PATH + '/helpers/reactweb_helper.js' } }, multiple: { diff --git a/e2e/helpers/reactweb_helper.js b/e2e/helpers/reactweb_helper.js deleted file mode 100644 index 83cc1a47..00000000 --- a/e2e/helpers/reactweb_helper.js +++ /dev/null @@ -1,87 +0,0 @@ -'use strict'; - -class ReactWeb extends Helper { - // // before/after hooks - // _before() { - // // remove if not used - // } - - // _after() { - // // remove if not used - // } - - // add custom methods here - // If you need to access other helpers - // use: this.helpers['helperName'] - - /** - * Execute code only on iOS - * - * ```js - * I.runOnIOS(() => { - * I.click('//UIAApplication[1]/UIAWindow[1]/UIAButton[1]'); - * I.see('Hi, IOS', '~welcome'); - * }); - * ``` - * - * Additional filter can be applied by checking for capabilities. - * For instance, this code will be executed only on iPhone 5s: - * - * - * ```js - * I.runOnIOS({deviceName: 'iPhone 5s'},() => { - * // ... - * }); - * ``` - * - * @param {*} caps - * @param {*} fn - */ - runOnIOS(caps, fn) { - return; - } - - /** - * Execute code only on Android - * - * ```js - * I.runOnAndroid(() => { - * I.click('io.selendroid.testapp:id/buttonTest'); - * }); - * ``` - * - * Additional filter can be applied by checking for capabilities. - * For instance, this code will be executed only on Android 6.0: - * - * - * ```js - * I.runOnAndroid({platformVersion: '6.0'},() => { - * // ... - * }); - * ``` - * - * @param {*} caps - * @param {*} fn - */ - runOnAndroid(caps, fn) { - return; - } - - /** - * Execute code only in Web mode. - * - * ```js - * I.runInWeb(() => { - * I.waitForElement('#data'); - * I.seeInCurrentUrl('/data'); - * }); - * ``` - * - * @param {*} fn - */ - runInWeb(fn) { - return fn(); - } -} - -module.exports = ReactWeb; diff --git a/package.json b/package.json index 02aef73e..26ef37f7 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "e2e-android": "codeceptjs run --profile=android", "e2e-ios": "codeceptjs run --profile=ios", "checkversion": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json", - "patch-codeceptjs-webdriverio": "wget https://raw.githubusercontent.com/flyskywhy/CodeceptJS/master/lib/helper/WebDriverIO.js -O node_modules/codeceptjs/lib/helper/WebDriverIO.js", - "postinstall": "npm run checkversion; npm run patch-codeceptjs-webdriverio", + "postinstall": "npm run checkversion", "push-android": "code-push release-react Noder android --deploymentName Staging", "push-ios": "code-push release-react Noder ios --deploymentName Staging", "push-android-prod": "code-push release-react Noder android --deploymentName Production", @@ -49,7 +48,7 @@ "react-native-scrollable-tab-view": "^0.7.4", "react-native-vector-icons": "^4.0.1", "react-redux": "4.4.8", - "react-web": "git+https://github.com/flyskywhy/react-web.git", + "react-web": "https://github.com/flyskywhy/react-web.git#73e1bbc", "redux": "^3.5.2", "redux-actions": "^2.0.1", "redux-logger": "^3.0.1", @@ -65,7 +64,7 @@ "babel-preset-react": "^6.5.0", "babel-preset-react-native": "4.0.0", "babel-preset-stage-1": "^6.5.0", - "codeceptjs-webdriverio": "^1.1.0", + "codeceptjs": "1.1.0", "coffee-script": "^1.9.2", "dev-ip": "^1.0.1", "eslint": "^3.19.0", @@ -92,6 +91,7 @@ "standard": "^10.0.1", "url-loader": "^0.5.7", "webdriver-manager": "^12.0.6", + "webdriverio": "4.9.11", "webpack": "^1.13.2", "webpack-dev-server": "^1.14.1", "webpack-html-plugin": "^0.1.1" @@ -100,8 +100,8 @@ "preset": "react-native" }, "devEngines": { - "node": ">= 6.11.1", - "npm": ">= 3.x" + "node": ">= 8.9.1", + "npm": ">= 5.x" }, "bundleId": "org.reactjs.native.example.noder", "standard": { diff --git a/src/layouts/User.js b/src/layouts/User.js index ec129d37..fa30d839 100644 --- a/src/layouts/User.js +++ b/src/layouts/User.js @@ -103,7 +103,7 @@ class User extends Component { }}> @@ -115,7 +115,7 @@ class User extends Component { onPress={() => this.setting.show()}> diff --git a/yarn.lock b/yarn.lock index 02b9107d..f1bdc937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1677,27 +1677,19 @@ code-push@1.11.2-beta: superagent-proxy "^1.0.0" yazl "^2.4.1" -codeceptjs-webdriverio@^1.1.0: +codeceptjs@1.1.0: version "1.1.0" - resolved "http://registry.npm.taobao.org/codeceptjs-webdriverio/download/codeceptjs-webdriverio-1.1.0.tgz#dea40681bff852638b6e8595d70a00b8a916ff88" - dependencies: - codeceptjs "*" - webdriverio "*" - -codeceptjs@*: - version "1.0.3" - resolved "http://registry.npm.taobao.org/codeceptjs/download/codeceptjs-1.0.3.tgz#9236b4bcbc74e034bb9890a25da7bc6d3430d1c1" + resolved "http://registry.npm.taobao.org/codeceptjs/download/codeceptjs-1.1.0.tgz#da8bcc52bd81052d9d236bc9911bc50b191cf60a" dependencies: chalk "^1.1.3" - co "^4.6.0" - commander "^2.9.0" + commander "^2.12.2" escape-string-regexp "^1.0.3" get-function-arguments "^1.0.0" glob "^6.0.1" inquirer "^0.11.0" - js-function-reflector "^1.3.0" + js-function-reflector "^1.3.1" mkdirp "^0.5.1" - mocha "^3.1.2" + mocha "^4.0.1" requireg "^0.1.5" coffee-script@^1.9.2: @@ -1732,13 +1724,7 @@ commander@2.6.x: version "2.6.0" resolved "http://registry.npm.taobao.org/commander/download/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d" -commander@2.9.0: - version "2.9.0" - resolved "http://registry.npm.taobao.org/commander/download/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^2.9.0: +commander@^2.12.2, commander@^2.9.0: version "2.12.2" resolved "http://registry.npm.taobao.org/commander/download/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" @@ -2099,12 +2085,6 @@ debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8: dependencies: ms "2.0.0" -debug@2.6.8: - version "2.6.8" - resolved "http://registry.npm.taobao.org/debug/download/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" - dependencies: - ms "2.0.0" - debug@3.1.0, debug@^3.1.0: version "3.1.0" resolved "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -2243,10 +2223,6 @@ dev-ip@^1.0.1: version "1.0.1" resolved "http://registry.npm.taobao.org/dev-ip/download/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" -diff@3.2.0: - version "3.2.0" - resolved "http://registry.npm.taobao.org/diff/download/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" - diff@3.3.1: version "3.3.1" resolved "http://registry.npm.taobao.org/diff/download/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" @@ -3298,17 +3274,6 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" -glob@7.1.1: - version "7.1.1" - resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -3442,18 +3407,10 @@ graceful-fs@~1.2.0: version "1.2.3" resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "http://registry.npm.taobao.org/graceful-readlink/download/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - growl@1.10.3: version "1.10.3" resolved "http://registry.npm.taobao.org/growl/download/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" -growl@1.9.2: - version "1.9.2" - resolved "http://registry.npm.taobao.org/growl/download/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" - growly@^1.3.0: version "1.3.0" resolved "http://registry.npm.taobao.org/growly/download/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -4478,7 +4435,7 @@ joi@^6.6.1: moment "2.x.x" topo "1.x.x" -js-function-reflector@^1.3.0: +js-function-reflector@^1.3.1: version "1.3.1" resolved "http://registry.npm.taobao.org/js-function-reflector/download/js-function-reflector-1.3.1.tgz#411968480c16274f4d3dbc17473c4938c7105fb6" @@ -4551,7 +4508,7 @@ json-stringify-safe@~5.0.1: version "5.0.1" resolved "http://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" -json3@3.3.2, json3@^3.3.2: +json3@^3.3.2: version "3.3.2" resolved "http://registry.npm.taobao.org/json3/download/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" @@ -4700,21 +4657,10 @@ lodash-es@^4.17.4, lodash-es@^4.2.1: version "4.17.4" resolved "http://registry.npm.taobao.org/lodash-es/download/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "http://registry.npm.taobao.org/lodash._baseassign/download/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" - lodash._basecopy@^3.0.0: version "3.0.1" resolved "http://registry.npm.taobao.org/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" -lodash._basecreate@^3.0.0: - version "3.0.3" - resolved "http://registry.npm.taobao.org/lodash._basecreate/download/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821" - lodash._basefor@^3.0.0: version "3.0.3" resolved "http://registry.npm.taobao.org/lodash._basefor/download/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2" @@ -4755,14 +4701,6 @@ lodash.cond@^4.3.0: version "4.5.2" resolved "http://registry.npm.taobao.org/lodash.cond/download/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5" -lodash.create@3.1.1: - version "3.1.1" - resolved "http://registry.npm.taobao.org/lodash.create/download/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7" - dependencies: - lodash._baseassign "^3.0.0" - lodash._basecreate "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash.escape@^3.0.0: version "3.2.0" resolved "http://registry.npm.taobao.org/lodash.escape/download/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" @@ -5073,23 +5011,6 @@ mkdirp@0.5.1, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi dependencies: minimist "0.0.8" -mocha@^3.1.2: - version "3.5.3" - resolved "http://registry.npm.taobao.org/mocha/download/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d" - dependencies: - browser-stdout "1.3.0" - commander "2.9.0" - debug "2.6.8" - diff "3.2.0" - escape-string-regexp "1.0.5" - glob "7.1.1" - growl "1.9.2" - he "1.1.1" - json3 "3.3.2" - lodash.create "3.1.1" - mkdirp "0.5.1" - supports-color "3.1.2" - mocha@^4.0.1: version "4.0.1" resolved "http://registry.npm.taobao.org/mocha/download/mocha-4.0.1.tgz#0aee5a95cf69a4618820f5e51fa31717117daf1b" @@ -6198,9 +6119,9 @@ react-transform-hmr@^1.0.4: global "^4.3.0" react-proxy "^1.1.7" -"react-web@git+https://github.com/flyskywhy/react-web.git": +"react-web@https://github.com/flyskywhy/react-web.git#73e1bbc": version "0.4.6" - resolved "git+https://github.com/flyskywhy/react-web.git#c8a90fddc21fa7787a4596f83f418194e049baee" + resolved "https://github.com/flyskywhy/react-web.git#73e1bbc4894b3cb1029efa8cbd8cd9fb3736d5af" dependencies: animated "0.1.3" autobind-decorator "1.3.3" @@ -7287,12 +7208,6 @@ superagent@^1.7.2: readable-stream "1.0.27-1" reduce-component "1.0.1" -supports-color@3.1.2: - version "3.1.2" - resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" - dependencies: - has-flag "^1.0.0" - supports-color@4.4.0: version "4.4.0" resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" @@ -7866,7 +7781,7 @@ webdriver-manager@^12.0.6: semver "^5.3.0" xml2js "^0.4.17" -webdriverio@*: +webdriverio@4.9.11: version "4.9.11" resolved "http://registry.npm.taobao.org/webdriverio/download/webdriverio-4.9.11.tgz#a828713c5a44be99afbe07eb5b523d5eccd04b44" dependencies: