Skip to content

Commit 3a16762

Browse files
committed
Move app loading in encryption trait below config value changes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
1 parent d8d53d3 commit 3a16762

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

tests/lib/Traits/EncryptionTrait.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,16 @@ protected function setUpEncryptionTrait() {
8787
$this->markTestSkipped('Encryption not ready');
8888
}
8989

90-
\OC_App::loadApp('encryption');
91-
92-
$this->encryptionApp = new Application([], $isReady);
93-
9490
$this->config = \OC::$server->getConfig();
9591
$this->encryptionWasEnabled = $this->config->getAppValue('core', 'encryption_enabled', 'no');
9692
$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
9793
$this->config->setAppValue('core', 'default_encryption_module', \OCA\Encryption\Crypto\Encryption::ID);
9894
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
95+
96+
\OC_App::loadApp('encryption');
97+
98+
$this->encryptionApp = new Application();
99+
99100
$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
100101
}
101102

0 commit comments

Comments
 (0)