fix(share): avoid disconnect when transitioning to full remote

spot-client/src/spot-remote/ui/loaders/withRemoteControl.js

@@ -28,21 +28,9 @@ export class RemoteControlLoader extends AbstractLoader {
      *
      * @param {Object} props - The read-only properties with which the new
      * instance is to be initialized.
-     * @param {boolean} disconnectOnUnmount - Whether or not the RCS should be disconnected when this loader component
-     * is being unmounted.
      */
-    constructor(props, disconnectOnUnmount) {
+    constructor(props) {
         super(props, 'SpotRemote');
-        this._disconnectOnUnmount = disconnectOnUnmount;
-    }
-
-    /**
-     * Clean up connection related state.
-     *
-     * @inheritdoc
-     */
-    componentWillUnmount() {
-        this._disconnectOnUnmount && this.props.onDisconnect();
     }
 
     /**

spot-client/src/spot-remote/ui/views/remote-control.js

@@ -11,6 +11,7 @@ import { LoadingIcon, View } from 'common/ui';
 
 import './../../analytics';
 
+import { disconnectFromSpotTV } from './../../app-state';
 import {
     ElectronDesktopPickerModal,
     WaitingForSpotTVOverlay
@@ -30,6 +31,7 @@ export class RemoteControl extends React.PureComponent {
         events: PropTypes.array,
         history: PropTypes.object,
         isConnectedToSpot: PropTypes.bool,
+        onDisconnect: PropTypes.func,
         view: PropTypes.string
     };
 
@@ -43,6 +45,15 @@ export class RemoteControl extends React.PureComponent {
         super(props, true);
     }
 
+    /**
+     * Clean up connection related state.
+     *
+     * @inheritdoc
+     */
+    componentWillUnmount() {
+        this.props.onDisconnect();
+    }
+
     /**
      * Implements React's {@link Component#render()}.
      *
@@ -104,4 +115,28 @@ function mapStateToProps(state) {
     };
 }
 
-export default withUltrasound(withRemoteControl(connect(mapStateToProps)(RemoteControl)));
+/**
+ * Creates actions which can update Redux state.
+ *
+ * @param {Function} dispatch - The Redux dispatch function to update state.
+ * @private
+ * @returns {Object}
+ */
+function mapDispatchToProps(dispatch) {
+    return {
+        /**
+         * Stop any existing connection to a Spot-TV.
+         *
+         * @returns {void}
+         */
+        onDisconnect() {
+            dispatch(disconnectFromSpotTV());
+        }
+    };
+}
+
+export default withUltrasound(
+    withRemoteControl(
+        connect(mapStateToProps, mapDispatchToProps)(RemoteControl)
+    )
+);

spot-client/src/spot-remote/ui/views/remote-views/waiting-for-call.js

@@ -86,7 +86,9 @@ class WaitingForCallView extends React.Component {
         const { activeTab } = this.state;
 
         return (
-            <div className = 'waiting-view'>
+            <div
+                className = 'waiting-view'
+                data-qa-id = 'waiting-for-call-view'>
                 { this.props._enableAutoUpdate
                     && <AutoUpdateChecker
                         onUpdateAvailable = { this.props._onUpdateAvailable } /> }

spot-webdriver/page-objects/remote-control-page.js

@@ -5,6 +5,7 @@ const ScreensharePicker = require('./screenshare-picker');
 const MEET_NOW_BUTTON = '[data-qa-id=meet-now]';
 const REMOTE_CONTROL = '[data-qa-id=remoteControl-view]';
 const SHARE_CONTENT_BUTTON = '[data-qa-id=share-content]';
+const WAITING_FOR_CALL_SUBVIEW = '[data-qa-id=waiting-for-call-view]';
 const WAITING_FOR_SPOT_TV_LABEL = '[data-qa-id=waiting-for-spot-tv]';
 
 /**
@@ -45,6 +46,16 @@ class RemoteControlPage extends PageObject {
         return new PageObject(this.driver, WAITING_FOR_SPOT_TV_LABEL);
     }
 
+    /**
+     * Wait specifically for the subview of the remote control page which shows
+     * when Spot-TV is not in a call.
+     *
+     * @returns {void}
+     */
+    waitWaitingForCallViewToDisplay() {
+        this.waitForElementDisplayed(WAITING_FOR_CALL_SUBVIEW);
+    }
+
     /**
      * Begins the wireless screensharing flow for when there is both wireless
      * and wired screensharing enabled.

spot-webdriver/specs/share-mode.spec.js

@@ -45,5 +45,7 @@ describe('In share mode', () => {
         const remoteControlPage = spotRemote.getRemoteControlPage();
 
         remoteControlPage.waitForVisible();
+
+        remoteControlPage.waitWaitingForCallViewToDisplay();
     });
 });