Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
4f56712c
Commit
4f56712c
authored
3 years ago
by
Ming Rui Zhang
Committed by
Andreas Traczyk
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wizardviewstepmodel: remove profile page flow from imported accounts
Gitlab:
#470
Change-Id: I9dd65e83885e89b447d6354c984d3d707e9f7061
parent
4884708a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/wizardviewstepmodel.cpp
+6
-3
6 additions, 3 deletions
src/wizardviewstepmodel.cpp
tests/qml/src/tst_WizardView.qml
+30
-18
30 additions, 18 deletions
tests/qml/src/tst_WizardView.qml
with
36 additions
and
21 deletions
src/wizardviewstepmodel.cpp
+
6
−
3
View file @
4f56712c
...
...
@@ -36,10 +36,13 @@ WizardViewStepModel::WizardViewStepModel(LRCInstance* lrcInstance,
accountAdapter_
->
changeAccount
(
index
);
auto
accountCreationOption
=
get_accountCreationOption
();
if
(
accountCreationOption
==
AccountCreationOption
::
ConnectToAccountManager
||
accountCreationOption
==
AccountCreationOption
::
ImportFromBackup
||
accountCreationOption
==
AccountCreationOption
::
ImportFromDevice
)
if
(
accountCreationOption
==
AccountCreationOption
::
ConnectToAccountManager
)
set_mainStep
(
MainSteps
::
Profile
);
else
if
(
accountCreationOption
==
AccountCreationOption
::
ImportFromBackup
||
accountCreationOption
==
AccountCreationOption
::
ImportFromDevice
)
{
Q_EMIT
closeWizardView
();
reset
();
}
Q_EMIT
accountIsReady
(
accountId
);
});
...
...
This diff is collapsed.
Click to expand it.
tests/qml/src/tst_WizardView.qml
+
30
−
18
View file @
4f56712c
...
...
@@ -29,6 +29,14 @@ import "qrc:/src/wizardview"
WizardView
{
id
:
uut
function
clearSignalSpy
()
{
spyAccountIsReady
.
clear
()
spyAccountIsRemoved
.
clear
()
spyAccountConfigFinalized
.
clear
()
spyReportFailure
.
clear
()
spyCloseWizardView
.
clear
()
}
SignalSpy
{
id
:
spyAccountIsReady
...
...
@@ -64,6 +72,13 @@ WizardView {
signalName
:
"
reportFailure
"
}
SignalSpy
{
id
:
spyCloseWizardView
target
:
WizardViewStepModel
signalName
:
"
closeWizardView
"
}
TestCase
{
name
:
"
WelcomePage to different account creation page and return back
"
when
:
windowShown
...
...
@@ -195,10 +210,7 @@ WizardView {
when
:
windowShown
function
test_createJamiAccountUiFlow
()
{
spyAccountIsReady
.
clear
()
spyAccountIsRemoved
.
clear
()
spyAccountStatusChanged
.
clear
()
spyAccountConfigFinalized
.
clear
()
uut
.
clearSignalSpy
()
var
controlPanelStackView
=
findChild
(
uut
,
"
controlPanelStackView
"
)
...
...
@@ -265,6 +277,9 @@ WizardView {
WizardViewStepModel
.
nextStep
()
}
spyCloseWizardView
.
wait
()
compare
(
spyCloseWizardView
.
count
,
1
)
// Check alias text
compare
(
SettingsAdapter
.
getCurrentAccount_Profile_Info_Alias
(),
aliasText
)
...
...
@@ -286,10 +301,7 @@ WizardView {
}
function
test_createRendezVousAccountUiFlow
()
{
spyAccountIsReady
.
clear
()
spyAccountIsRemoved
.
clear
()
spyAccountStatusChanged
.
clear
()
spyAccountConfigFinalized
.
clear
()
uut
.
clearSignalSpy
()
var
controlPanelStackView
=
findChild
(
uut
,
"
controlPanelStackView
"
)
...
...
@@ -359,6 +371,9 @@ WizardView {
WizardViewStepModel
.
nextStep
()
}
spyCloseWizardView
.
wait
()
compare
(
spyCloseWizardView
.
count
,
1
)
// Check alias text
compare
(
SettingsAdapter
.
getCurrentAccount_Profile_Info_Alias
(),
aliasText
)
...
...
@@ -385,10 +400,7 @@ WizardView {
when
:
windowShown
function
test_createSipAccountUiFlow
()
{
spyAccountIsReady
.
clear
()
spyAccountIsRemoved
.
clear
()
spyAccountStatusChanged
.
clear
()
spyAccountConfigFinalized
.
clear
()
uut
.
clearSignalSpy
()
var
controlPanelStackView
=
findChild
(
uut
,
"
controlPanelStackView
"
)
...
...
@@ -445,6 +457,9 @@ WizardView {
WizardViewStepModel
.
nextStep
()
spyCloseWizardView
.
wait
()
compare
(
spyCloseWizardView
.
count
,
1
)
AccountAdapter
.
deleteCurrentAccount
()
// Wait until the account removal is finished
...
...
@@ -458,10 +473,7 @@ WizardView {
when
:
windowShown
function
test_createJamiAccountFromBackupUiFlow
()
{
spyAccountIsReady
.
clear
()
spyAccountIsRemoved
.
clear
()
spyAccountConfigFinalized
.
clear
()
spyReportFailure
.
clear
()
uut
.
clearSignalSpy
()
var
controlPanelStackView
=
findChild
(
uut
,
"
controlPanelStackView
"
)
...
...
@@ -506,8 +518,8 @@ WizardView {
compare
(
spyAccountIsReady
.
count
,
1
)
spyAccountConfigFinalized
.
wait
()
compare
(
spyAccountConfigFinalized
.
count
,
1
)
WizardViewStepModel
.
nextStep
(
)
spyCloseWizardView
.
wait
()
compare
(
spyCloseWizardView
.
count
,
1
)
AccountAdapter
.
deleteCurrentAccount
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment