Skip to content

Commit 8658ef4

Browse files
committed
fix: ensure FolderMan singleton is initialized when needed
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
1 parent 14b305b commit 8658ef4

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

src/gui/folderman.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class TestSyncConflictsModel;
2929
class TestRemoteWipe;
3030
class FolderManTestHelper;
3131
class TestFileActionsModel;
32+
class TestBrowserReAuthController;
3233

3334
namespace OCC {
3435

@@ -416,6 +417,7 @@ private slots:
416417
friend class ::TestRemoteWipe;
417418
friend class ::FolderManTestHelper;
418419
friend class ::TestFileActionsModel;
420+
friend class ::TestBrowserReAuthController;
419421
};
420422

421423
} // namespace OCC

test/testbrowserreauthcontroller.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,23 @@ class TestBrowserReAuthController : public QObject
135135
{
136136
Q_OBJECT
137137

138+
std::unique_ptr<FolderMan> _fm;
139+
138140
private slots:
139141
void initTestCase()
140142
{
143+
OCC::Logger::instance()->setLogFlush(true);
144+
OCC::Logger::instance()->setLogDebug(true);
145+
141146
QStandardPaths::setTestModeEnabled(true);
147+
142148
Q_INIT_RESOURCE(resources);
143149
Q_INIT_RESOURCE(theme);
144150
qmlRegisterSingletonInstance("com.nextcloud.desktopclient", 1, 0, "UserModel", UserModel::instance());
145151
qmlRegisterSingletonInstance("com.nextcloud.desktopclient", 1, 0, "Theme", Theme::instance());
152+
153+
_fm.reset(new FolderMan{});
154+
146155
Systray::instance()->setTrayEngine(new QQmlApplicationEngine(QCoreApplication::instance()));
147156
}
148157

0 commit comments

Comments
 (0)