Skip to content

GitLab

T
tangled
Commit 4a2c7df2 authored by Gordon Seto's avatar Gordon Seto Committed by Chromium LUCI CQ
Browse files
Options

[CrOS Settings] Add backward navigation logic to eSIM flow. 

Add backward navigation to eSIM setup flow. Add unit tests for logic.

Bug: 1093185
Change-Id: I1fffd4c953597d1d900bf3c99411601b3474c32e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2637970Reviewed-by: default avatarAzeem Arshad <azeemarshad@chromium.org>
Commit-Queue: Gordon Seto <gordonseto@google.com>
Cr-Commit-Position: refs/heads/master@{#845356}
parent ccc8b6f3
Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 21 deletions
chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.js
View file @ 4a2c7df2
......@@ -170,6 +170,35 @@ suite('CrComponentsEsimFlowUiTest', function() {
cellular_setup.ESimPageName.CONFIRMATION_CODE, confirmationCodePage);
assertTrue(confirmationCodeInput.invalid);
});
test('Navigate backwards from confirmation code', async function() {
euicc.setProfileInstallResultForTest(
chromeos.cellularSetup.mojom.ProfileInstallResult
.kErrorNeedsConfirmationCode);
eSimPage.navigateForward();
await flushAsync();
// Confirmation code page should be showing.
assertSelectedPage(
cellular_setup.ESimPageName.CONFIRMATION_CODE, confirmationCodePage);
confirmationCodePage.$$('#confirmationCode').value = 'CONFIRMATION_CODE';
assertTrue(eSimPage.attemptBackwardNavigation());
await flushAsync();
// Should now be at the activation code page.
assertSelectedPage(
cellular_setup.ESimPageName.ACTIVATION_CODE, activationCodePage);
assertEquals(confirmationCodePage.$$('#confirmationCode').value, '');
assertEquals(
activationCodePage.$$('#activationCode').value, 'ACTIVATION_CODE');
// Navigating backwards should return false since we're at the beginning.
assertFalse(eSimPage.attemptBackwardNavigation());
await flushAsync();
});
});
suite('Single eSIM profile flow', function() {
......@@ -261,11 +290,36 @@ suite('CrComponentsEsimFlowUiTest', function() {
cellular_setup.ESimPageName.CONFIRMATION_CODE, confirmationCodePage);
assertTrue(confirmationCodeInput.invalid);
});
test('Navigate backwards from confirmation code', async function() {
profile.setProfileInstallResultForTest(
chromeos.cellularSetup.mojom.ProfileInstallResult
.kErrorNeedsConfirmationCode);
// Loading page should be showing.
assertSelectedPage(
cellular_setup.ESimPageName.PROFILE_LOADING, profileLoadingPage);
await flushAsync();
// Confirmation code page should be showing.
assertSelectedPage(
cellular_setup.ESimPageName.CONFIRMATION_CODE, confirmationCodePage);
confirmationCodePage.$$('#confirmationCode').value = 'CONFIRMATION_CODE';
// Navigating backwards should return false since we're at the beginning.
assertFalse(eSimPage.attemptBackwardNavigation());
await flushAsync();
});
});
suite('Multiple eSIM profiles flow', function() {
let euicc;
setup(async function() {
eSimManagerRemote.addEuiccForTest(2);
const availableEuiccs = await eSimManagerRemote.getAvailableEuiccs();
euicc = availableEuiccs.euiccs[0];
eSimPage.initSubflow();
// Loading page should be showing.
......@@ -279,7 +333,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
cellular_setup.ESimPageName.PROFILE_DISCOVERY, profileDiscoveryPage);
});
test('Skip discovery flow', async function() {
function skipDiscovery() {
// Simulate pressing 'Skip'.
assertTrue(
eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
......@@ -293,9 +347,14 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Insert an activation code.
activationCodePage.$$('#activationCode').value = 'ACTIVATION_CODE';
// Simulate pressing 'Forward'.
assertTrue(
eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
}
test('Skip discovery flow', async function() {
skipDiscovery();
// Simulate pressing 'Forward'.
eSimPage.navigateForward();
await flushAsync();
......@@ -303,7 +362,51 @@ suite('CrComponentsEsimFlowUiTest', function() {
assertSelectedPage(cellular_setup.ESimPageName.FINAL, finalPage);
});
test('Select profile flow', async function() {
test(
'Navigate backwards from skip discovery flow with confirmation code',
async function() {
skipDiscovery();
euicc.setProfileInstallResultForTest(
chromeos.cellularSetup.mojom.ProfileInstallResult
.kErrorNeedsConfirmationCode);
eSimPage.navigateForward();
await flushAsync();
// Confirmation code page should be showing.
assertSelectedPage(
cellular_setup.ESimPageName.CONFIRMATION_CODE,
confirmationCodePage);
confirmationCodePage.$$('#confirmationCode').value =
'CONFIRMATION_CODE';
// Simulate pressing 'Backward'.
assertTrue(eSimPage.attemptBackwardNavigation());
await flushAsync();
assertSelectedPage(
cellular_setup.ESimPageName.ACTIVATION_CODE, activationCodePage);
assertEquals(
activationCodePage.$$('#activationCode').value,
'ACTIVATION_CODE');
assertEquals(confirmationCodePage.$$('#confirmationCode').value, '');
assertTrue(eSimPage.attemptBackwardNavigation());
await flushAsync();
assertSelectedPage(
cellular_setup.ESimPageName.PROFILE_DISCOVERY,
profileDiscoveryPage);
assertEquals(
eSimPage.forwardButtonLabel, 'Skip & Set up new profile');
// Navigating backwards should return false since we're at the
// beginning.
assertFalse(eSimPage.attemptBackwardNavigation());
});
function selectProfile() {
// Select the first profile on the list.
const profileList = profileDiscoveryPage.$$('#profileList');
profileList.selectItem(profileList.items[0]);
......@@ -315,6 +418,10 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Simulate pressing 'Forward'.
eSimPage.navigateForward();
}
test('Select profile flow', async function() {
selectProfile();
await flushAsync();
// Should now be at the final page.
......@@ -329,17 +436,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
chromeos.cellularSetup.mojom.ProfileInstallResult
.kErrorNeedsConfirmationCode);
// Select the first profile on the list.
const profileListUI = profileDiscoveryPage.$$('#profileList');
profileListUI.selectItem(profileListUI.items[0]);
Polymer.dom.flush();
// The 'Forward' button should now be enabled.
assertTrue(
eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
// Simulate pressing 'Forward'.
eSimPage.navigateForward();
selectProfile();
await flushAsync();
// Confirmation code page should be showing.
......@@ -361,5 +458,38 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Should go to final page.
assertSelectedPage(cellular_setup.ESimPageName.FINAL, finalPage);
});
test(
'Navigate backwards from select profile with confirmation code flow',
async function() {
const availableEuiccs = await eSimManagerRemote.getAvailableEuiccs();
const profileList = await availableEuiccs.euiccs[0].getProfileList();
profileList.profiles[0].setProfileInstallResultForTest(
chromeos.cellularSetup.mojom.ProfileInstallResult
.kErrorNeedsConfirmationCode);
selectProfile();
await flushAsync();
// Confirmation code page should be showing.
assertSelectedPage(
cellular_setup.ESimPageName.CONFIRMATION_CODE,
confirmationCodePage);
confirmationCodePage.$$('#confirmationCode').value =
'CONFIRMATION_CODE';
assertTrue(eSimPage.attemptBackwardNavigation());
await flushAsync();
assertSelectedPage(
cellular_setup.ESimPageName.PROFILE_DISCOVERY,
profileDiscoveryPage);
assertEquals(eSimPage.forwardButtonLabel, 'Next');
confirmationCodePage.$$('#confirmationCode').value = '';
// Navigating backwards should return false since we're at the
// beginning.
assertFalse(eSimPage.attemptBackwardNavigation());
});
});
});
ui/webui/resources/cr_components/chromeos/cellular_setup/esim_flow_ui.js
View file @ 4a2c7df2
......@@ -49,6 +49,7 @@ cr.define('cellular_setup', function() {
state_: {
type: String,
value: ESimUiState.PROFILE_SEARCH,
observer: 'onStateChanged_',
},
/**
......@@ -124,10 +125,7 @@ cr.define('cellular_setup', function() {
'activation-code-updated': 'onActivationCodeUpdated_',
},
observers: [
'updateSelectedPage_(state_)', 'updateButtonBarState_(state_)',
'onSelectedProfileChanged_(selectedProfile_)'
],
observers: ['onSelectedProfileChanged_(selectedProfile_)'],
/** @override */
created() {
......@@ -204,6 +202,13 @@ cr.define('cellular_setup', function() {
}
},
/** @private */
onStateChanged_(oldState, newState) {
this.updateSelectedPage_();
this.updateButtonBarState_();
this.initializePageState_(oldState, newState);
},
/** @private */
updateSelectedPage_() {
switch (this.state_) {
......@@ -240,7 +245,8 @@ cr.define('cellular_setup', function() {
cancel: this.delegate.shouldShowCancelButton() ?
cellularSetup.ButtonState.ENABLED :
undefined,
forward: cellularSetup.ButtonState.DISABLED,
forward: this.activationCode_ ? cellularSetup.ButtonState.ENABLED :
cellularSetup.ButtonState.DISABLED,
};
break;
case ESimUiState.CONFIRMATION_CODE_ENTRY:
......@@ -254,8 +260,11 @@ cr.define('cellular_setup', function() {
};
break;
case ESimUiState.PROFILE_SELECTION:
this.forwardButtonLabel = this.i18n('skipDiscovery');
this.forwardButtonLabel = this.selectedProfile_ ?
this.i18n('next') :
this.i18n('skipDiscovery');
buttonState = {
backward: cellularSetup.ButtonState.ENABLED,
cancel: this.delegate.shouldShowCancelButton() ?
cellularSetup.ButtonState.ENABLED :
undefined,
......@@ -275,6 +284,15 @@ cr.define('cellular_setup', function() {
this.set('buttonState', buttonState);
},
/** @private */
initializePageState_(oldState, newState) {
this.confirmationCode_ = '';
if (newState === ESimUiState.ACTIVATION_CODE_ENTRY &&
oldState !== ESimUiState.CONFIRMATION_CODE_ENTRY) {
this.activationCode_ = '';
}
},
/** @private */
onActivationCodeUpdated_(event) {
this.set(
......@@ -344,7 +362,22 @@ cr.define('cellular_setup', function() {
* SubflowBehavior override
*/
attemptBackwardNavigation() {
// TODO(crbug.com/1093185): Handle state when camera is used
if (this.state_ === ESimUiState.ACTIVATION_CODE_ENTRY &&
this.pendingProfiles_.length > 1) {
this.state_ = ESimUiState.PROFILE_SELECTION;
return true;
} else if (this.state_ === ESimUiState.CONFIRMATION_CODE_ENTRY) {
if (this.activationCode_) {
this.state_ = ESimUiState.ACTIVATION_CODE_ENTRY;
} else if (this.pendingProfiles_.length === 0) {
this.state_ = ESimUiState.ACTIVATION_CODE_ENTRY;
} else if (this.pendingProfiles_.length > 1) {
this.state_ = ESimUiState.PROFILE_SELECTION;
} else {
return false;
}
return true;
}
return false;
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment