Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move code for configuring setup detection in wizard tests into separate function

This commit is contained in:
Martchus 2022-11-05 13:59:59 +01:00
parent 256e90a0cb
commit 10ddc79382
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widgets/tests/wizard.cpp
View File

@ -33,6 +33,7 @@ private Q_SLOTS:
private:
bool confirmMessageBox();
void configureSyncthingArgs(SetupDetection &setupDetection) const;
QTemporaryDir m_homeDir;
QEventLoop m_eventLoop;
@ -219,12 +220,7 @@ void WizardTests::testConfiguringLauncher()
m_eventLoop.exec();
QVERIFY(label->text().contains(QStringLiteral("The internal launcher has not been initialized.")));
QVERIFY(label->text().contains(QStringLiteral("You may try to head back")));
// override launcher settings so tests can use a custom Syncthing binary and a custom port
auto &setupDetection = wizardDlg.setupDetection();
setupDetection.launcherSettings.syncthingPath = m_syncthingPath;
setupDetection.defaultSyncthingArgs.append(QStringLiteral(" --gui-address="));
setupDetection.defaultSyncthingArgs.append(m_syncthingGuiAddress);
configureSyncthingArgs(wizardDlg.setupDetection());
// try again with launcher being initialized
wizardDlg.back();
@ -338,11 +334,7 @@ void WizardTests::testConfiguringCurrentlyRunningSyncthing()
auto *const autostartPage = qobject_cast<AutostartWizardPage *>(wizardDlg.currentPage());
QVERIFY(autostartPage != nullptr);
wizardDlg.next();
// override launcher settings so tests can use a custom Syncthing binary and a custom port
setupDetection.launcherSettings.syncthingPath = m_syncthingPath;
setupDetection.defaultSyncthingArgs.append(QStringLiteral(" --gui-address="));
setupDetection.defaultSyncthingArgs.append(m_syncthingGuiAddress);
configureSyncthingArgs(setupDetection);
// apply settings
auto *const applyPage = qobject_cast<ApplyWizardPage *>(wizardDlg.currentPage());
@ -408,5 +400,15 @@ bool WizardTests::confirmMessageBox()
return false;
}
/*!
* \brief Overrides launcher settings so tests can use a custom Syncthing binary and a custom port.
*/
void WizardTests::configureSyncthingArgs(SetupDetection &setupDetection) const
{
setupDetection.launcherSettings.syncthingPath = m_syncthingPath;
setupDetection.defaultSyncthingArgs.append(QStringLiteral(" --gui-address="));
setupDetection.defaultSyncthingArgs.append(m_syncthingGuiAddress);
}
QTEST_MAIN(WizardTests)
#include "wizard.moc"