feat(android-setup): Fix adbLocation-related problems

src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import { getStoreStateMessage, Messages } from '../../../common/messages';
 import { StoreNames } from '../../../common/stores/store-names';
-import { SetTelemetryStatePayload } from '../../actions/action-payloads';
+import { SetAdbLocationPayload, SetTelemetryStatePayload } from '../../actions/action-payloads';
 import { Interpreter } from '../../interpreter';
 import { UserConfigurationActionCreator } from '../user-configuration-action-creator';
 
@@ -38,8 +38,8 @@ export const registerUserConfigurationMessageCallback = (
         Messages.UserConfig.SaveIssueFilingSettings,
         userConfigurationActionCreator.saveIssueFilingSettings,
     );
-    interpreter.registerTypeToPayloadCallback(
+    interpreter.registerTypeToPayloadCallback<SetAdbLocationPayload>(
         Messages.UserConfig.SetAdbLocationConfig,
-        userConfigurationActionCreator.setAdbLocation,
+        payload => userConfigurationActionCreator.setAdbLocation(payload.adbLocation),
     );
 };

src/background/global-action-creators/user-configuration-action-creator.ts

@@ -10,6 +10,8 @@ import {
 import { UserConfigurationActions } from '../actions/user-configuration-actions';
 
 export class UserConfigurationActionCreator {
+    private readonly currentScope: string = 'UserConfigurationActionCreator';
+
     constructor(private readonly userConfigActions: UserConfigurationActions) {}
 
     public getUserConfigurationState = () => this.userConfigActions.getCurrentState.invoke(null);
@@ -33,5 +35,5 @@ export class UserConfigurationActionCreator {
         this.userConfigActions.saveIssueFilingSettings.invoke(payload);
 
     public setAdbLocation = (adbLocation: string) =>
-        this.userConfigActions.setAdbLocation.invoke(adbLocation);
+        this.userConfigActions.setAdbLocation.invoke(adbLocation, this.currentScope);
 }

src/electron/platform/android/setup/steps/prompt-locate-adb.ts

@@ -8,7 +8,7 @@ export const promptLocateAdb: AndroidSetupStepConfig = deps => {
         actions: {
             saveAdbPath: (path: string) => {
                 deps.setAdbPath(path);
-                deps.stepTransition('prompt-connect-to-device');
+                deps.stepTransition('detect-adb');
             },
         },
     };

src/tests/unit/tests/background/global-action-creators/action-creator-test-helpers.ts

@@ -5,9 +5,16 @@ import { Action } from 'common/flux/action';
 import { isFunction } from 'lodash';
 import { IMock, It, Mock, Times } from 'typemoq';
 
-export const createActionMock = <Payload>(payload: Payload): IMock<Action<Payload>> => {
+export const createActionMock = <Payload>(
+    payload: Payload,
+    scope: string = null,
+): IMock<Action<Payload>> => {
     const actionMock = Mock.ofType<Action<Payload>>(Action);
-    actionMock.setup(action => action.invoke(payload)).verifiable(Times.once());
+    if (scope) {
+        actionMock.setup(action => action.invoke(payload, scope)).verifiable(Times.once());
+    } else {
+        actionMock.setup(action => action.invoke(payload)).verifiable(Times.once());
+    }
     return actionMock;
 };
 

src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts

@@ -120,7 +120,10 @@ describe('UserConfigurationActionCreator', () => {
     it('should SetAdbLocation Message', () => {
         const expectedAdbLocation = 'Somewhere over the rainbow';
 
-        const setAdbLocationConfigMock = createActionMock(expectedAdbLocation);
+        const setAdbLocationConfigMock = createActionMock(
+            expectedAdbLocation,
+            'UserConfigurationActionCreator',
+        );
         const actionsMock = createActionsMock('setAdbLocation', setAdbLocationConfigMock.object);
         const testSubject = new UserConfigurationActionCreator(actionsMock.object);
 

src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts

@@ -19,7 +19,7 @@ describe('Android setup step: promptLocateAdb', () => {
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.setAdbPath(testPath)).verifiable(Times.once());
-        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('detect-adb')).verifiable(Times.once());
 
         const step = promptLocateAdb(depsMock.object);
         step.actions.saveAdbPath(testPath);