diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-19 12:17:13 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-19 12:17:13 +0100 |
| commit | 7ba90eda87d7e66b9c0ad7ec025371f623bf1857 (patch) | |
| tree | dc83cf2b58a05b4f32e725340e04a70c87a79f6e /tests | |
| parent | 5dd6a04e86a399f371b33a6dc097458b5f7ef75f (diff) | |
| parent | 62cf14e448b3727d123f54ee0e6877109ea4b668 (diff) | |
| download | nextcloud-server-7ba90eda87d7e66b9c0ad7ec025371f623bf1857.tar.gz nextcloud-server-7ba90eda87d7e66b9c0ad7ec025371f623bf1857.zip | |
Merge pull request #21774 from owncloud/test-autoload-encryption
always allow autoloading encryption in unit test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/settings/controller/EncryptionControllerTest.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/settings/controller/EncryptionControllerTest.php b/tests/settings/controller/EncryptionControllerTest.php index 2446b8c7b9e..a3bb4c45a27 100644 --- a/tests/settings/controller/EncryptionControllerTest.php +++ b/tests/settings/controller/EncryptionControllerTest.php @@ -90,6 +90,9 @@ class EncryptionControllerTest extends TestCase { } public function testStartMigrationSuccessful() { + // we need to be able to autoload the class we're mocking + \OC::$loader->addValidRoot(\OC_App::getAppPath('encryption')); + $migration = $this->getMockBuilder('\\OCA\\Encryption\\Migration') ->disableOriginalConstructor()->getMock(); $this->encryptionController |