Add sauce datacenters (#966)

appium · May 2, 2019 · 9045f6c · 9045f6c
1 parent 808a9d3
commit 9045f6c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 19 deletions.
diff --git a/app/renderer/actions/Session.js b/app/renderer/actions/Session.js
@@ -185,7 +185,8 @@ export function newSession (caps, attachSessId = null) {
         https = session.server.remote.ssl;
         break;
       case ServerTypes.sauce:
-        host = 'ondemand.saucelabs.com';
+        host = session.server.sauce.dataCenter === 'eu-central-1' ?
+          'ondemand.eu-central-1.saucelabs.com' : 'ondemand.saucelabs.com';
         port = 80;
         if (session.server.sauce.useSCProxy) {
           host = session.server.sauce.scHost || 'localhost';

diff --git a/app/renderer/components/Session/ServerTabSauce.js b/app/renderer/components/Session/ServerTabSauce.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
-import { Form, Row, Col, Input, Checkbox } from 'antd';
+import { Form, Row, Col, Input, Checkbox, Radio } from 'antd';
+import SessionStyles from './Session.css';
 const FormItem = Form.Item;
 
 export default class ServerTabSauce extends Component {
@@ -28,6 +29,17 @@ export default class ServerTabSauce extends Component {
           </FormItem>
         </Col>
       </Row>
+      <Row gutter={8}>
+        <Col span={24}>
+          <FormItem>
+            <div className={['ant-input-group-addon', SessionStyles.addonDataCenter].join(' ') }>{t('SauceLabs Data Center')}</div>
+            <Radio.Group className={SessionStyles.inputDataCenter} buttonStyle="solid" defaultValue='us-west-1' id='sauceObjectDataCenter' value={server.sauce.dataCenter} onChange={(e) => setServerParam('dataCenter', e.target.value)}>
+              <Radio value='us-west-1'>{t('US')}</Radio>
+              <Radio value='eu-central-1'>{t('EU')}</Radio>
+            </Radio.Group>
+          </FormItem>
+        </Col>
+      </Row>
       <Row gutter={8}>
         <Col span={10}>
           <FormItem>

diff --git a/app/renderer/reducers/Session.js b/app/renderer/reducers/Session.js
@@ -13,7 +13,6 @@ import { NEW_SESSION_REQUESTED, NEW_SESSION_BEGAN, NEW_SESSION_DONE,
          IS_ADDING_CLOUD_PROVIDER, SET_PROVIDERS,
          ServerTypes } from '../actions/Session';
 
-
 const visibleProviders = []; // Pull this from "electron-settings"
 const server = {
   local: {},
@@ -25,15 +24,30 @@ for (const serverName of _.keys(ServerTypes)) {
   server[serverName] = {};
 }
 
-server.testobject.dataCenter = 'US';
-
 // Make sure there's always at least one cap
 const INITIAL_STATE = {
   savedSessions: [],
   tabKey: 'new',
   serverType: ServerTypes.local,
-  server,
   visibleProviders,
+  server: {
+    local: {},
+    remote: {},
+    sauce: {
+      dataCenter: 'us-west-1',
+    },
+    testobject: {
+      dataCenter: 'US',
+    },
+    headspin: {},
+    browserstack: {},
+    advanced: {},
+    bitbar: {},
+    kobiton: {},
+    perfecto: {},
+    pcloudy: {},
+    testingbot: {},
+  },
   attachSessId: null,
 
   // Make sure there's always at least one cap
@@ -182,20 +196,20 @@ export default function session (state = INITIAL_STATE, action) {
     case SET_SERVER:
       return {
         ...state,
-        // Only set remote and cloud providers;
-        // 'local' comes from electron-settings
         server: {
-          ...state.server,
-          remote: action.server.remote || {},
-          sauce: action.server.sauce || {},
-          testobject: action.server.testobject || {},
-          headspin: action.server.headspin || {},
-          browserstack: action.server.browserstack || {},
-          bitbar: action.server.bitbar || {},
-          kobiton: action.server.kobiton || {},
-          perfecto: action.server.perfecto || {},
-          pcloudy: action.server.pcloudy || {},
-          testingbot: action.server.testingbot || {},
+          ...(function extendCurrentServerStateWithNewServerState (currentServerState, newServerState) {
+            // Copy current server state and extend it with new server state
+            const nextServerState = _.cloneDeep(currentServerState || {});
+
+            // Extend each server (sauce, testobject, remote, kobiton, etc...)
+            for (let serverName of _.keys(nextServerState)) {
+              nextServerState[serverName] = {
+                ...(nextServerState[serverName] || {}),
+                ...(newServerState[serverName] || {}),
+              };
+            }
+            return nextServerState;
+          })(state.server, action.server),
         },
         serverType: action.serverType || ServerTypes.local,
       };

diff --git a/assets/locales/en/translation.json b/assets/locales/en/translation.json
@@ -177,6 +177,7 @@
   "xCoordinate": "X: {{x}}",
   "yCoordinate": "Y: {{y}}",
   "TestObject Data Center": "TestObject Data Center",
+  "SauceLabs Data Center": "SauceLabs Data Center",
   "US": "US",
   "EU": "EU",
   "proxyThroughSC": "Proxy through Sauce Connect's Selenium Relay",