From ce48856d6bb0d81e61b704ef6b4665145657a79d Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Wed, 10 Feb 2021 00:37:48 -0800 Subject: [PATCH] chore: update to 1.20.2 (#1690) * feat: bump appium to 1.20.2 * feat: add roboticmobi tab to inspector tab #1666 * chore: bump the version * missing js --- app/renderer/actions/Session.js | 9 +++++ .../components/Session/CloudProviders.js | 9 ++++- .../Session/ServerTabRoboticMobi.js | 23 ++++++++++++ app/renderer/images/roboticmobi_logo.svg | 11 ++++++ app/renderer/reducers/Session.js | 1 + package-lock.json | 36 +++++++------------ package.json | 4 +-- 7 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 app/renderer/components/Session/ServerTabRoboticMobi.js create mode 100644 app/renderer/images/roboticmobi_logo.svg diff --git a/app/renderer/actions/Session.js b/app/renderer/actions/Session.js index 363bd2799..a19946e6f 100644 --- a/app/renderer/actions/Session.js +++ b/app/renderer/actions/Session.js @@ -345,6 +345,15 @@ export function newSession (caps, attachSessId = null) { port = session.server.experitest.port = experitestUrl.port; https = session.server.experitest.ssl = experitestUrl.protocol === 'https:'; break; + } case ServerTypes.roboticmobi: { + host = 'api.robotic.mobi'; + path = '/wd/hub'; + port = 443; + https = 'https:'; + if (caps) { + desiredCapabilities.robotic_mobi_token = session.server.roboticmobi.token || process.env.ROBOTIC_MOBI_TOKEN; + } + break; } default: break; diff --git a/app/renderer/components/Session/CloudProviders.js b/app/renderer/components/Session/CloudProviders.js index 8da18aed8..9d03c0ddd 100644 --- a/app/renderer/components/Session/CloudProviders.js +++ b/app/renderer/components/Session/CloudProviders.js @@ -9,6 +9,7 @@ import ServerTabPcloudy from './ServerTabPcloudy'; import ServerTabSauce from './ServerTabSauce'; import ServerTabTestingbot from './ServerTabTestingbot'; import ServerTabExperitest from './ServerTabExperitest'; +import ServerTabRoboticMobi from './ServerTabRoboticMobi'; import SessionStyles from './Session.css'; @@ -23,6 +24,7 @@ import PerfectoLogo from '../../images/perfecto_logo.png'; import PcloudyLogo from '../../images/pcloudy_logo.svg'; import TestingBotLogo from '../../images/testingbot_logo.svg'; import ExperitestLogo from '../../images/experitest_logo.svg'; +import RoboticMobiLogo from '../../images/roboticmobi_logo.svg'; const CloudProviders = { sauce: { @@ -75,6 +77,11 @@ const CloudProviders = { tab: (props) => , logo: ExperitestLogo, }, + roboticmobi: { + tabhead: () => , + tab: (props) => , + logo: RoboticMobiLogo, + } }; -export default CloudProviders; \ No newline at end of file +export default CloudProviders; diff --git a/app/renderer/components/Session/ServerTabRoboticMobi.js b/app/renderer/components/Session/ServerTabRoboticMobi.js new file mode 100644 index 000000000..201f7c21c --- /dev/null +++ b/app/renderer/components/Session/ServerTabRoboticMobi.js @@ -0,0 +1,23 @@ +import React, { Component } from 'react'; +import { Form, Input, Row, Col } from 'antd'; + +const FormItem = Form.Item; +export default class ServerTabRoboticMobi extends Component { + render () { + + const { server, setServerParam, t } = this.props; + + const placeholder = process.env.ROBOTIC_MOBI_TOKEN ? + t('usingDataFoundIn', { environmentVariable: 'ROBOTIC_MOBI_TOKEN' }) : t('roboticMobiToken'); + + return
+ + + + setServerParam('token', e.target.value)} /> + + + +
; + } +} diff --git a/app/renderer/images/roboticmobi_logo.svg b/app/renderer/images/roboticmobi_logo.svg new file mode 100644 index 000000000..98fb8f1f1 --- /dev/null +++ b/app/renderer/images/roboticmobi_logo.svg @@ -0,0 +1,11 @@ + + +Created by potrace 1.15, written by Peter Selinger 2001-2017 + + + +Layer 1 + + + +

text

 ROBOTIC.MOBI

 \ No newline at end of file diff --git a/app/renderer/reducers/Session.js b/app/renderer/reducers/Session.js index 99d69217f..d29782517 100644 --- a/app/renderer/reducers/Session.js +++ b/app/renderer/reducers/Session.js @@ -48,6 +48,7 @@ const INITIAL_STATE = { pcloudy: {}, testingbot: {}, experitest: {}, + roboticmobi: {}, }, attachSessId: null, diff --git a/package-lock.json b/package-lock.json index cf75cb757..6a847efef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "appium-desktop", - "version": "1.20.0", + "version": "1.20.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2991,9 +2991,9 @@ } }, "appium": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/appium/-/appium-1.20.0.tgz", - "integrity": "sha512-2GLFvbp3E4yaRxtKcfeWZg68+plSeG6byd6QHCd52t256KJrjWL/Y7yJJdnsUMd7DU5T0prtVV9b+CyJz4J4tQ==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/appium/-/appium-1.20.2.tgz", + "integrity": "sha512-4uQ47RmQn01L1X1rjCUcs6KHL0nWuOpTZ4v5roeHZfj5mRo29w8nUD9TKKh7yuu1uNsuQaWbjOlIuzjo6TtiOQ==", "requires": { "@babel/runtime": "^7.6.0", "appium-android-driver": "^4.20.0", @@ -3008,7 +3008,7 @@ "appium-safari-driver": "^2.1.0", "appium-support": "2.x", "appium-tizen-driver": "^1.1.1-beta.4", - "appium-uiautomator2-driver": "^1.37.1", + "appium-uiautomator2-driver": "^1.61.2", "appium-windows-driver": "1.x", "appium-xcuitest-driver": "^3.33.1", "appium-youiengine-driver": "^1.2.0", @@ -5335,9 +5335,9 @@ } }, "appium-uiautomator2-driver": { - "version": "1.60.0", - "resolved": "https://registry.npmjs.org/appium-uiautomator2-driver/-/appium-uiautomator2-driver-1.60.0.tgz", - "integrity": "sha512-hd8YWGUQ1EF8CrA87JhE/hIz8PmobDvryvtuo8cPl0cO/Bd72usto5snzhktDuXS03O1AHXYMb04/z+/IpZMkQ==", + "version": "1.61.2", + "resolved": "https://registry.npmjs.org/appium-uiautomator2-driver/-/appium-uiautomator2-driver-1.61.2.tgz", + "integrity": "sha512-BPR4R898h7+XUiZDVQTZWpLSNmiX1+xL33m1MZV0pFxt4Uy1VFWWgOTcF49MTDKEiePZoWwfZtRYRsgvdBAybQ==", "requires": { "@babel/runtime": "^7.0.0", "appium-adb": "^8.9.0", @@ -5345,9 +5345,9 @@ "appium-base-driver": "^7.0.0", "appium-chromedriver": "^4.23.1", "appium-support": "^2.49.0", - "appium-uiautomator2-server": "^4.13.0", + "appium-uiautomator2-server": "^4.17.4", "asyncbox": "^2.3.1", - "axios": "^0.20.0", + "axios": "^0.21.0", "bluebird": "^3.5.1", "css-selector-parser": "^1.4.1", "lodash": "^4.17.4", @@ -5355,22 +5355,12 @@ "source-map-support": "^0.5.5", "teen_process": "^1.3.1", "yargs": "^16.0.0" - }, - "dependencies": { - "axios": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz", - "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==", - "requires": { - "follow-redirects": "^1.10.0" - } - } } }, "appium-uiautomator2-server": { - "version": "4.17.2", - "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-4.17.2.tgz", - "integrity": "sha512-nlY3CVGYqHY5PVIFswvKrJVb/xUPeenCYU9KskGT7O8w/S6JSZuv9cw15yaE7eHpHW9qQ4EfvpEpDR3uJluAyg==" + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-4.17.4.tgz", + "integrity": "sha512-x4FqjU6usdLHtOfjbwS6MM55tYYb4IfqojGe5olC5Hw6umQ57rK6LEnnUwFcUd7NrBcTfsklMANJV6s89S4nfQ==" }, "appium-webdriveragent": { "version": "2.32.2", diff --git a/package.json b/package.json index 84628784c..9d58ec373 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appium-desktop", - "version": "1.20.0", + "version": "1.20.2", "description": "Graphical interface for the Appium server, and an app inspector", "repository": { "type": "git", @@ -119,7 +119,7 @@ "@babel/polyfill": "^7.4.0", "ansi-to-html": "~0.6.7", "antd": "~4.0.4", - "appium": "1.20.0", + "appium": "1.20.2", "appium-support": "^2.25.0", "bluebird": "^3.5.5", "cheerio": "^1.0.0-rc.3",