From ddb659dd90229f0ae02ab10bc67778667da66cd2 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 2 Sep 2016 12:53:44 +0200 Subject: [PATCH] increase core version number to trigger db ugprade and fix app manager tests --- tests/lib/App/ManagerTest.php | 16 ++++++++++++++-- version.php | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/lib/App/ManagerTest.php b/tests/lib/App/ManagerTest.php index 80754413fc..f3a91d4f5f 100644 --- a/tests/lib/App/ManagerTest.php +++ b/tests/lib/App/ManagerTest.php @@ -306,7 +306,8 @@ class ManagerTest extends TestCase { $this->appConfig->setValue('test1', 'enabled', 'yes'); $this->appConfig->setValue('test2', 'enabled', 'no'); $this->appConfig->setValue('test3', 'enabled', '["foo"]'); - $this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3', 'workflowengine'], $this->manager->getInstalledApps()); + $apps = ['dav', 'federatedfilesharing', 'files', 'test1', 'test3', 'twofactor_backupcodes', 'workflowengine']; + $this->assertEquals($apps, $this->manager->getInstalledApps()); } public function testGetAppsForUser() { @@ -320,7 +321,16 @@ class ManagerTest extends TestCase { $this->appConfig->setValue('test2', 'enabled', 'no'); $this->appConfig->setValue('test3', 'enabled', '["foo"]'); $this->appConfig->setValue('test4', 'enabled', '["asd"]'); - $this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3', 'workflowengine'], $this->manager->getEnabledAppsForUser($user)); + $enabled = [ + 'dav', + 'federatedfilesharing', + 'files', + 'test1', + 'test3', + 'twofactor_backupcodes', + 'workflowengine' + ]; + $this->assertEquals($enabled, $this->manager->getEnabledAppsForUser($user)); } public function testGetAppsNeedingUpgrade() { @@ -338,6 +348,7 @@ class ManagerTest extends TestCase { 'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'], 'test4' => ['id' => 'test4', 'version' => '3.0.0', 'requiremin' => '8.1.0'], 'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'], + 'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'], 'workflowengine' => ['id' => 'workflowengine'], ]; @@ -379,6 +390,7 @@ class ManagerTest extends TestCase { 'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'], 'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'], 'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'], + 'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'], 'workflowengine' => ['id' => 'workflowengine'], ]; diff --git a/version.php b/version.php index 8cf0822bc7..01a822708e 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 2, 0, 2); +$OC_Version = array(9, 2, 0, 3); // The human readable string $OC_VersionString = '11.0 alpha';