Skip to content
Snippets Groups Projects
Commit b6a566d1 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

wizardview: hide back button while waiting for account generations

Gitlab: #470

Change-Id: I79d1b5c77ae9e983e1c264532727616afb23f3ab
parent 4f56712c
No related branches found
No related tags found
No related merge requests found
......@@ -206,10 +206,14 @@ Rectangle {
BackButton {
id: backButton
objectName: "connectToAccountManagerPageBackButton"
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: 20
visible: !connectBtn.spinnerTriggered
preferredSize: JamiTheme.wizardViewPageBackButtonSize
onClicked: WizardViewStepModel.previousStep()
......
......@@ -215,10 +215,14 @@ Rectangle {
BackButton {
id: backButton
objectName: "importFromBackupPageBackButton"
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: 20
visible: !connectBtn.spinnerTriggered
preferredSize: JamiTheme.wizardViewPageBackButtonSize
onClicked: WizardViewStepModel.previousStep()
......
......@@ -178,10 +178,14 @@ Rectangle {
BackButton {
id: backButton
objectName: "importFromDevicePageBackButton"
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: 20
visible: !connectBtn.spinnerTriggered
preferredSize: JamiTheme.wizardViewPageBackButtonSize
onClicked: WizardViewStepModel.previousStep()
......
......@@ -35,6 +35,8 @@ WizardView {
spyAccountConfigFinalized.clear()
spyReportFailure.clear()
spyCloseWizardView.clear()
spyBackButtonVisible.target = undefined
}
SignalSpy {
......@@ -79,6 +81,12 @@ WizardView {
signalName: "closeWizardView"
}
SignalSpy {
id: spyBackButtonVisible
signalName: "visibleChanged"
}
TestCase {
name: "WelcomePage to different account creation page and return back"
when: windowShown
......@@ -484,6 +492,7 @@ WizardView {
var passwordFromBackupEdit = findChild(importFromBackupPage, "passwordFromBackupEdit")
var connectBtn = findChild(importFromBackupPage, "connectBtn")
var errorLabel = findChild(importFromBackupPage, "errorLabel")
var backButton = findChild(importFromBackupPage, "importFromBackupPageBackButton")
// WelcomePage initially
compare(controlPanelStackView.children[controlPanelStackView.currentIndex],
......@@ -492,6 +501,9 @@ WizardView {
// Go to importFromBackup page
WizardViewStepModel.startAccountCreationFlow(
WizardViewStepModel.AccountCreationOption.ImportFromBackup)
spyBackButtonVisible.target = backButton
compare(passwordFromBackupEdit.focus, true)
var fileName = "gz_test.gz"
......@@ -505,6 +517,9 @@ WizardView {
connectBtn.clicked()
spyReportFailure.wait()
verify(spyReportFailure.count >= 1)
spyBackButtonVisible.wait()
verify(spyBackButtonVisible.count >= 2)
spyBackButtonVisible.clear()
compare(importFromBackupPage.errorText, JamiStrings.errorCreateAccount)
compare(errorLabel.visible, true)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment