From a9a6fef4523a39a6ea31cebe9a795b13647c627b Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Thu, 2 Dec 2021 22:13:50 +0200 Subject: [PATCH 1/4] #1151 update appium package.json --- appium/config/wdio.shared.conf.js | 2 +- appium/package.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/appium/config/wdio.shared.conf.js b/appium/config/wdio.shared.conf.js index fbeadcf82..6b068f8fa 100644 --- a/appium/config/wdio.shared.conf.js +++ b/appium/config/wdio.shared.conf.js @@ -5,7 +5,7 @@ exports.config = { runner: 'local', framework: 'jasmine', - jasmineNodeOpts: { + jasmineOpts: { defaultTimeoutInterval: 600000, requires: ['ts-node/register', 'tsconfig-paths/register'] }, diff --git a/appium/package.json b/appium/package.json index fd699df45..4775faf55 100644 --- a/appium/package.json +++ b/appium/package.json @@ -8,7 +8,7 @@ "only.test.settings": "./node_modules/.bin/wdio ./config/wdio.ios.app.conf.js --suite settings", "only.test.all": "./node_modules/.bin/wdio ./config/wdio.ios.app.conf.js --suite all", "only.test.inbox": "./node_modules/.bin/wdio ./config/wdio.ios.app.conf.js --suite inbox", - "only.test.filter": "./node_modules/.bin/wdio ./config/wdio.ios.app.conf.js --suite all --jasmineNodeOpts.grep", + "only.test.filter": "./node_modules/.bin/wdio ./config/wdio.ios.app.conf.js --suite all --jasmineOpts.grep", "test": "npm run-script build.app && npm run-script only.test.all", "build.app": "cd .. && bundle exec fastlane build", "lint": "cd .. && ./appium/node_modules/.bin/eslint appium/ --ext .ts" @@ -27,16 +27,16 @@ "@types/request": "^2.48.7", "@typescript-eslint/eslint-plugin": "^5.3.1", "@typescript-eslint/parser": "^5.3.1", - "@wdio/allure-reporter": "7.16.3", - "@wdio/appium-service": "7.16.4", - "@wdio/cli": "7.16.4", - "@wdio/jasmine-framework": "7.16.4", - "@wdio/local-runner": "6.10.13", - "@wdio/spec-reporter": "6.10.6", - "appium": "1.22.0", + "@wdio/allure-reporter": "7.16.10", + "@wdio/appium-service": "7.16.6", + "@wdio/cli": "7.16.10", + "@wdio/jasmine-framework": "7.16.6", + "@wdio/local-runner": "7.16.10", + "@wdio/spec-reporter": "7.16.9", + "appium": "1.22.1", "babel-eslint": "^10.1.0", "dotenv": "^10.0.0", - "eslint": "^8.2.0", + "eslint": "^7.12.1", "eslint-config-standard": "^16.0.3", "eslint-plugin-import": "^2.25.2", "eslint-plugin-node": "^11.1.0", @@ -51,6 +51,6 @@ "ts-node": "^10.4.0", "typescript": "^4.4.4", "wdio-video-reporter": "^3.1.3", - "webdriverio": "7.16.4" + "webdriverio": "7.16.10" } } From 6068dfd61f400aed115c9138ae9ece062ef3a988 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Thu, 2 Dec 2021 22:52:48 +0200 Subject: [PATCH 2/4] #1151 fix jasmineOpts --- appium/config/wdio.shared.conf.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appium/config/wdio.shared.conf.js b/appium/config/wdio.shared.conf.js index 6b068f8fa..414fcfd97 100644 --- a/appium/config/wdio.shared.conf.js +++ b/appium/config/wdio.shared.conf.js @@ -6,8 +6,7 @@ exports.config = { runner: 'local', framework: 'jasmine', jasmineOpts: { - defaultTimeoutInterval: 600000, - requires: ['ts-node/register', 'tsconfig-paths/register'] + defaultTimeoutInterval: 600000 }, sync: true, logLevel: 'silent', From fa5063ced9467e9850433b3b6606bb63803edc06 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Tue, 7 Dec 2021 17:13:40 +0200 Subject: [PATCH 3/4] #1151 update package.json --- appium/config/wdio.shared.conf.js | 3 +-- appium/package.json | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/appium/config/wdio.shared.conf.js b/appium/config/wdio.shared.conf.js index 937d4b9f1..68dfe6d3f 100644 --- a/appium/config/wdio.shared.conf.js +++ b/appium/config/wdio.shared.conf.js @@ -12,8 +12,7 @@ exports.config = { runner: 'local', framework: 'jasmine', jasmineOpts: { - defaultTimeoutInterval: 600000, - requires: ['ts-node/register', 'tsconfig-paths/register'] + defaultTimeoutInterval: 600000 }, sync: true, logLevel: 'silent', diff --git a/appium/package.json b/appium/package.json index d18319137..b8d456c78 100644 --- a/appium/package.json +++ b/appium/package.json @@ -34,11 +34,9 @@ "appium": "1.22.1", "babel-eslint": "^10.1.0", "dotenv": "^10.0.0", - "eslint": "^7.12.1", - "eslint-config-standard": "^16.0.3", + "eslint": "^8.4.1", "eslint-plugin-import": "^2.25.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.1.1", "eslint-plugin-wdio": "^7.4.2", "mailparser": "3.4.0", "node-fetch": "^3.1.0", From c9498a33ea16f57768a2b803ba48a696df622be9 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Wed, 8 Dec 2021 13:30:49 +0200 Subject: [PATCH 4/4] #1151 update config --- appium/config/wdio.shared.conf.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appium/config/wdio.shared.conf.js b/appium/config/wdio.shared.conf.js index 68dfe6d3f..e47be4a1d 100644 --- a/appium/config/wdio.shared.conf.js +++ b/appium/config/wdio.shared.conf.js @@ -12,7 +12,8 @@ exports.config = { runner: 'local', framework: 'jasmine', jasmineOpts: { - defaultTimeoutInterval: 600000 + defaultTimeoutInterval: 600000, + requires: ['tsconfig-paths/register'] }, sync: true, logLevel: 'silent',