summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/acceptance/features/app-files-sharing-link.feature1
-rw-r--r--tests/acceptance/features/app-theming.feature8
-rw-r--r--tests/acceptance/features/bootstrap/LoginPageContext.php4
-rw-r--r--tests/acceptance/features/bootstrap/SettingsMenuContext.php2
-rw-r--r--tests/acceptance/features/bootstrap/ThemingAppContext.php12
-rw-r--r--tests/acceptance/features/bootstrap/UsersSettingsContext.php8
-rw-r--r--tests/acceptance/features/core/ActorContext.php4
-rw-r--r--tests/acceptance/features/header.feature2
-rw-r--r--tests/lib/Calendar/ManagerTest.php71
-rw-r--r--tests/lib/Collaboration/Collaborators/MailPluginTest.php10
-rw-r--r--tests/lib/Collaboration/Collaborators/RemotePluginTest.php10
-rw-r--r--tests/lib/Federation/CloudIdManagerTest.php17
-rw-r--r--tests/lib/Files/Storage/HomeStorageQuotaTest.php84
-rw-r--r--tests/lib/NavigationManagerTest.php2
14 files changed, 96 insertions, 139 deletions
diff --git a/tests/acceptance/features/app-files-sharing-link.feature b/tests/acceptance/features/app-files-sharing-link.feature
index ac6ff058fec..4fab8391531 100644
--- a/tests/acceptance/features/app-files-sharing-link.feature
+++ b/tests/acceptance/features/app-files-sharing-link.feature
@@ -119,7 +119,6 @@ Feature: app-files-sharing-link
And I create a new folder named "Subfolder"
And I see that the file list contains a file named "Subfolder"
When I act as John
- And I close the details view
And I enter in the folder named "Editable shared folder"
Then I see that the file list contains a file named "Subfolder"
diff --git a/tests/acceptance/features/app-theming.feature b/tests/acceptance/features/app-theming.feature
index b6364ae4f44..676b90ab06e 100644
--- a/tests/acceptance/features/app-theming.feature
+++ b/tests/acceptance/features/app-theming.feature
@@ -9,10 +9,10 @@ Feature: app-theming
# The "eventually" part is not really needed here, as the colour is not
# being animated at this point, but there is no need to create a specific
# step just for this.
- And I see that the header color is eventually "#0082C9"
+ And I see that the background color is eventually "#0082C9"
When I set the "Color" parameter in the Theming app to "#C9C9C9"
Then I see that the parameters in the Theming app are eventually saved
- And I see that the header color is eventually "#C9C9C9"
+ And I see that the background color is eventually "#C9C9C9"
Scenario: resetting the color updates the header color
Given I am logged in as the admin
@@ -21,7 +21,7 @@ Feature: app-theming
And I see that the color selector in the Theming app has loaded
And I set the "Color" parameter in the Theming app to "#C9C9C9"
And I see that the parameters in the Theming app are eventually saved
- And I see that the header color is eventually "#C9C9C9"
+ And I see that the background color is eventually "#C9C9C9"
When I reset the "Color" parameter in the Theming app to its default value
Then I see that the parameters in the Theming app are eventually saved
- And I see that the header color is eventually "#0082C9"
+ And I see that the background color is eventually "#0082C9"
diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php
index 3fb06abb235..01ad34ba149 100644
--- a/tests/acceptance/features/bootstrap/LoginPageContext.php
+++ b/tests/acceptance/features/bootstrap/LoginPageContext.php
@@ -54,7 +54,7 @@ class LoginPageContext implements Context, ActorAwareInterface {
}
public static function wrongPasswordMessage(): Locator {
- return Locator::forThe()->xpath("//*[@class = 'warning wrongPasswordMsg' and normalize-space() = 'Wrong username or password.']")->
+ return Locator::forThe()->xpath("//*[@class = 'input-field__helper-text-message input-field__helper-text-message--error' and normalize-space() = 'Wrong username or password.']")->
describedAs("Wrong password message in Login page");
}
@@ -62,7 +62,7 @@ class LoginPageContext implements Context, ActorAwareInterface {
* @return Locator
*/
public static function userDisabledMessage() {
- return Locator::forThe()->xpath("//*[@class = 'warning userDisabledMsg' and normalize-space() = 'User disabled']")->
+ return Locator::forThe()->xpath("//*[@class = 'input-field__helper-text-message input-field__helper-text-message--error' and normalize-space() = 'User disabled']")->
describedAs('User disabled message on login page');
}
diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
index 0effe906240..f89d8782198 100644
--- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php
+++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
@@ -148,7 +148,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
*/
public function iVisitTheAdminSettingsPage() {
$this->iOpenTheSettingsMenu();
- $this->actor->find(self::menuItemFor('Admin settings'), 2)->click();
+ $this->actor->find(self::menuItemFor('Administration settings'), 2)->click();
}
/**
diff --git a/tests/acceptance/features/bootstrap/ThemingAppContext.php b/tests/acceptance/features/bootstrap/ThemingAppContext.php
index d17d9c18109..248d58a1794 100644
--- a/tests/acceptance/features/bootstrap/ThemingAppContext.php
+++ b/tests/acceptance/features/bootstrap/ThemingAppContext.php
@@ -125,19 +125,19 @@ class ThemingAppContext implements Context, ActorAwareInterface {
}
/**
- * @Then I see that the header color is eventually :color
+ * @Then I see that the background color is eventually :color
*/
- public function iSeeThatTheHeaderColorIsEventually($color) {
- $headerColorMatchesCallback = function () use ($color) {
- $headerColor = $this->actor->getSession()->evaluateScript("return $('#header').css('background-color');");
+ public function iSeeThatTheBackgroundColorIsEventually($color) {
+ $backgroundColorMatchesCallback = function () use ($color) {
+ $headerColor = $this->actor->getSession()->evaluateScript("return $('body').css('background-color');");
$headerColor = $this->getRGBArray($headerColor);
$color = $this->getRGBArray($color);
return $headerColor == $color;
};
- if (!Utils::waitFor($headerColorMatchesCallback, $timeout = 10 * $this->actor->getFindTimeoutMultiplier(), $timeoutStep = 1)) {
- Assert::fail("The header color is not $color yet after $timeout seconds");
+ if (!Utils::waitFor($backgroundColorMatchesCallback, $timeout = 10 * $this->actor->getFindTimeoutMultiplier(), $timeoutStep = 1)) {
+ Assert::fail("The background color is not $color yet after $timeout seconds");
}
}
diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
index 074a9ff5f1a..4d17b3b5118 100644
--- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
@@ -293,8 +293,12 @@ class UsersSettingsContext implements Context, ActorAwareInterface {
* @Then I see that the new user form is shown
*/
public function iSeeThatTheNewUserFormIsShown() {
- Assert::assertTrue(
- $this->actor->find(self::newUserForm(), 10)->isVisible());
+ if (!WaitFor::elementToBeEventuallyShown(
+ $this->actor,
+ self::newUserForm(),
+ $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
+ Assert::fail("The new user form is not shown yet after $timeout seconds");
+ }
}
/**
diff --git a/tests/acceptance/features/core/ActorContext.php b/tests/acceptance/features/core/ActorContext.php
index b3c8b6f0459..aa538f06069 100644
--- a/tests/acceptance/features/core/ActorContext.php
+++ b/tests/acceptance/features/core/ActorContext.php
@@ -137,6 +137,8 @@ class ActorContext extends RawMinkContext {
$this->getSession()->start();
+ $this->getSession()->maximizeWindow();
+
$this->actors["default"] = new Actor("default", $this->getSession(), $this->getMinkParameter("base_url"), $this->sharedNotebook);
$this->actors["default"]->setFindTimeoutMultiplier($this->actorTimeoutMultiplier);
@@ -163,6 +165,8 @@ class ActorContext extends RawMinkContext {
if (!array_key_exists($actorName, $this->actors)) {
$this->getSession($actorName)->start();
+ $this->getSession($actorName)->maximizeWindow();
+
$this->actors[$actorName] = new Actor($actorName, $this->getSession($actorName), $this->getMinkParameter("base_url"), $this->sharedNotebook);
$this->actors[$actorName]->setFindTimeoutMultiplier($this->actorTimeoutMultiplier);
}
diff --git a/tests/acceptance/features/header.feature b/tests/acceptance/features/header.feature
index 2debb78638c..21f9147c9ac 100644
--- a/tests/acceptance/features/header.feature
+++ b/tests/acceptance/features/header.feature
@@ -8,7 +8,7 @@ Feature: header
And I see that the Settings menu has only 8 items
And I see that the "Set status" item in the Settings menu is shown
And I see that the "Personal settings" item in the Settings menu is shown
- And I see that the "Admin settings" item in the Settings menu is shown
+ And I see that the "Administration settings" item in the Settings menu is shown
And I see that the "Apps" item in the Settings menu is shown
And I see that the "Users" item in the Settings menu is shown
And I see that the "Help" item in the Settings menu is shown
diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php
index 8b99c21ae41..ba30be1b548 100644
--- a/tests/lib/Calendar/ManagerTest.php
+++ b/tests/lib/Calendar/ManagerTest.php
@@ -251,7 +251,7 @@ class ManagerTest extends TestCase {
$this->logger->expects(self::once())
->method('warning');
$this->time->expects(self::never())
- ->method('getTimestamp');
+ ->method('getTime');
$result = $this->manager->handleIMipReply($principalUri, $sender, $recipient, $calendarData->serialize());
$this->assertFalse($result);
@@ -266,7 +266,7 @@ class ManagerTest extends TestCase {
$this->logger->expects(self::once())
->method('warning');
$this->time->expects(self::never())
- ->method('getTimestamp');
+ ->method('getTime');
$result = $this->manager->handleIMipReply($principalUri, $sender, $recipient, $calendarData->serialize());
$this->assertFalse($result);
@@ -280,7 +280,7 @@ class ManagerTest extends TestCase {
$calendarData->VEVENT->DTSTART = new \DateTime('2013-04-07'); // set to in the past
$this->time->expects(self::once())
- ->method('getTimestamp')
+ ->method('getTime')
->willReturn(time());
$this->logger->expects(self::once())
@@ -301,15 +301,16 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$principalUri = 'principals/user/linus';
$sender = 'pierre@general-store.com';
$recipient = 'linus@stardew-tent-living.com';
$calendarData = $this->getVCalendarReply();
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->willReturn([]);
@@ -331,7 +332,8 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$calendar = $this->createMock(ICreateFromString::class);
$principalUri = 'principals/user/linus';
$sender = 'pierre@general-store.com';
@@ -339,8 +341,8 @@ class ManagerTest extends TestCase {
$calendarData = $this->getVCalendarReply();
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->willReturn([$calendar]);
@@ -367,7 +369,8 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$calendar = $this->createMock(ICreateFromString::class);
$principalUri = 'principals/user/linus';
$sender = 'pierre@general-store.com';
@@ -375,8 +378,8 @@ class ManagerTest extends TestCase {
$calendarData = $this->getVCalendarReply();
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->willReturn([$calendar]);
@@ -397,12 +400,12 @@ class ManagerTest extends TestCase {
$recipient = 'pierre@general-store.com';
$replyTo = null;
$calendarData = $this->getVCalendarCancel();
- $calendarData->VEVENT->METHOD = 'REQUEST';
+ $calendarData->METHOD = 'REQUEST';
$this->logger->expects(self::once())
->method('warning');
$this->time->expects(self::never())
- ->method('getTimestamp');
+ ->method('getTime');
$result = $this->manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
$this->assertFalse($result);
@@ -414,12 +417,11 @@ class ManagerTest extends TestCase {
$recipient = 'leah@general-store.com';
$replyTo = null;
$calendarData = $this->getVCalendarCancel();
- $calendarData->VEVENT->METHOD = 'CANCEL';
$this->logger->expects(self::once())
->method('warning');
$this->time->expects(self::never())
- ->method('getTimestamp');
+ ->method('getTime');
$result = $this->manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
$this->assertFalse($result);
@@ -434,7 +436,7 @@ class ManagerTest extends TestCase {
$calendarData->VEVENT->DTSTART = new \DateTime('2013-04-07'); // set to in the past
$this->time->expects(self::once())
- ->method('getTimestamp')
+ ->method('getTime')
->willReturn(time());
$this->logger->expects(self::once())
->method('warning');
@@ -454,7 +456,8 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$principalUri = 'principals/user/pierre';
$sender = 'linus@stardew-tent-living.com';
$recipient = 'pierre@general-store.com';
@@ -462,8 +465,8 @@ class ManagerTest extends TestCase {
$calendarData = $this->getVCalendarCancel();
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->with($principalUri)
@@ -471,8 +474,8 @@ class ManagerTest extends TestCase {
$this->logger->expects(self::once())
->method('warning');
- $result = $this->manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
- $this->assertTrue($result);
+ $result = $manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
+ $this->assertFalse($result);
}
public function testHandleImipCancelOrganiserInReplyTo(): void {
@@ -486,18 +489,18 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$principalUri = 'principals/user/pierre';
$sender = 'clint@stardew-blacksmiths.com';
$recipient = 'pierre@general-store.com';
$replyTo = 'linus@stardew-tent-living.com';
$calendar = $this->createMock(ICreateFromString::class);
$calendarData = $this->getVCalendarCancel();
- $calendarData->VEVENT->METHOD = 'CANCEL';
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->with($principalUri)
@@ -508,8 +511,8 @@ class ManagerTest extends TestCase {
$calendar->expects(self::once())
->method('handleIMipMessage')
->with('testname.ics', $calendarData->serialize());
- $result = $this->manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
- $this->assertFalse($result);
+ $result = $manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
+ $this->assertTrue($result);
}
public function testHandleImipCancel(): void {
@@ -523,18 +526,18 @@ class ManagerTest extends TestCase {
])
->setMethods([
'getCalendarsForPrincipal'
- ]);
+ ])
+ ->getMock();
$principalUri = 'principals/user/pierre';
$sender = 'linus@stardew-tent-living.com';
$recipient = 'pierre@general-store.com';
$replyTo = null;
$calendar = $this->createMock(ICreateFromString::class);
$calendarData = $this->getVCalendarCancel();
- $calendarData->VEVENT->METHOD = 'CANCEL';
$this->time->expects(self::once())
- ->method('getTimestamp')
- ->willReturn(202208219);
+ ->method('getTime')
+ ->willReturn(1628374233);
$manager->expects(self::once())
->method('getCalendarsForPrincipal')
->with($principalUri)
@@ -545,8 +548,8 @@ class ManagerTest extends TestCase {
$calendar->expects(self::once())
->method('handleIMipMessage')
->with('testname.ics', $calendarData->serialize());
- $result = $this->manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
- $this->assertFalse($result);
+ $result = $manager->handleIMipCancel($principalUri, $sender, $replyTo, $recipient, $calendarData->serialize());
+ $this->assertTrue($result);
}
private function getVCalendarReply(): Document {
diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
index 702c1d6be6e..3cf76c562a1 100644
--- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -29,7 +29,9 @@ use OC\Federation\CloudIdManager;
use OC\KnownUser\KnownUserService;
use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\Contacts\IManager;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\Federation\ICloudIdManager;
+use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IURLGenerator;
@@ -77,7 +79,13 @@ class MailPluginTest extends TestCase {
$this->knownUserService = $this->createMock(KnownUserService::class);
$this->userSession = $this->createMock(IUserSession::class);
$this->mailer = $this->createMock(IMailer::class);
- $this->cloudIdManager = new CloudIdManager($this->contactsManager, $this->createMock(IURLGenerator::class), $this->createMock(IUserManager::class));
+ $this->cloudIdManager = new CloudIdManager(
+ $this->contactsManager,
+ $this->createMock(IURLGenerator::class),
+ $this->createMock(IUserManager::class),
+ $this->createMock(ICacheFactory::class),
+ $this->createMock(IEventDispatcher::class)
+ );
$this->searchResult = new SearchResult();
}
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index 4072f3ecde1..22bd6f84be9 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -28,7 +28,9 @@ use OC\Collaboration\Collaborators\SearchResult;
use OC\Federation\CloudIdManager;
use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\Contacts\IManager;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\Federation\ICloudIdManager;
+use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IURLGenerator;
use OCP\IUser;
@@ -63,7 +65,13 @@ class RemotePluginTest extends TestCase {
$this->userManager = $this->createMock(IUserManager::class);
$this->config = $this->createMock(IConfig::class);
$this->contactsManager = $this->createMock(IManager::class);
- $this->cloudIdManager = new CloudIdManager($this->contactsManager, $this->createMock(IURLGenerator::class), $this->createMock(IUserManager::class));
+ $this->cloudIdManager = new CloudIdManager(
+ $this->contactsManager,
+ $this->createMock(IURLGenerator::class),
+ $this->createMock(IUserManager::class),
+ $this->createMock(ICacheFactory::class),
+ $this->createMock(IEventDispatcher::class)
+ );
$this->searchResult = new SearchResult();
}
diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php
index 92f8a5fa8dd..0db36b0524a 100644
--- a/tests/lib/Federation/CloudIdManagerTest.php
+++ b/tests/lib/Federation/CloudIdManagerTest.php
@@ -22,7 +22,10 @@
namespace Test\Federation;
use OC\Federation\CloudIdManager;
+use OC\Memcache\ArrayCache;
use OCP\Contacts\IManager;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\ICacheFactory;
use OCP\IURLGenerator;
use OCP\IUserManager;
use Test\TestCase;
@@ -36,6 +39,8 @@ class CloudIdManagerTest extends TestCase {
private $userManager;
/** @var CloudIdManager */
private $cloudIdManager;
+ /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
+ private $cacheFactory;
protected function setUp(): void {
@@ -45,7 +50,17 @@ class CloudIdManagerTest extends TestCase {
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->userManager = $this->createMock(IUserManager::class);
- $this->cloudIdManager = new CloudIdManager($this->contactsManager, $this->urlGenerator, $this->userManager);
+ $this->cacheFactory = $this->createMock(ICacheFactory::class);
+ $this->cacheFactory->method('createLocal')
+ ->willReturn(new ArrayCache(''));
+
+ $this->cloudIdManager = new CloudIdManager(
+ $this->contactsManager,
+ $this->urlGenerator,
+ $this->userManager,
+ $this->cacheFactory,
+ $this->createMock(IEventDispatcher::class)
+ );
}
public function cloudIdProvider() {
diff --git a/tests/lib/Files/Storage/HomeStorageQuotaTest.php b/tests/lib/Files/Storage/HomeStorageQuotaTest.php
deleted file mode 100644
index 177fe1b4f6c..00000000000
--- a/tests/lib/Files/Storage/HomeStorageQuotaTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace Test\Files\Storage;
-
-/**
- * Class HomeStorageQuotaTest
- *
- * @group DB
- */
-class HomeStorageQuotaTest extends \Test\TestCase {
- /**
- * Tests that the home storage is not wrapped when no quota exists.
- */
- public function testHomeStorageWrapperWithoutQuota() {
- $user1 = $this->getUniqueID();
- \OC::$server->getUserManager()->createUser($user1, 'test');
- \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none');
- \OC_User::setUserId($user1);
-
- \OC_Util::setupFS($user1);
-
- $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
- $this->assertNotNull($userMount);
- $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage());
-
- // clean up
- \OC_User::setUserId('');
- $user = \OC::$server->getUserManager()->get($user1);
- if ($user !== null) {
- $user->delete();
- }
- \OC::$server->getConfig()->deleteAllUserValues($user1);
- \OC_Util::tearDownFS();
- }
-
- /**
- * Tests that the home storage is not wrapped when no quota exists.
- */
- public function testHomeStorageWrapperWithQuota() {
- $user1 = $this->getUniqueID();
- \OC::$server->getUserManager()->createUser($user1, 'test');
- \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024');
- \OC_User::setUserId($user1);
-
- \OC_Util::setupFS($user1);
-
- $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
- $this->assertNotNull($userMount);
- $this->assertTrue($userMount->getStorage()->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota'));
-
- // ensure that root wasn't wrapped
- $rootMount = \OC\Files\Filesystem::getMountManager()->find('/');
- $this->assertNotNull($rootMount);
- $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage());
-
- // clean up
- \OC_User::setUserId('');
- $user = \OC::$server->getUserManager()->get($user1);
- if ($user !== null) {
- $user->delete();
- }
- \OC::$server->getConfig()->deleteAllUserValues($user1);
- \OC_Util::tearDownFS();
- }
-}
diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php
index d29b6888c2c..8d70b1b25ae 100644
--- a/tests/lib/NavigationManagerTest.php
+++ b/tests/lib/NavigationManagerTest.php
@@ -299,7 +299,7 @@ class NavigationManagerTest extends TestCase {
'order' => 3,
'href' => '/apps/test/',
'icon' => '/apps/settings/img/admin.svg',
- 'name' => 'Admin settings',
+ 'name' => 'Administration settings',
'active' => false,
'type' => 'settings',
'classes' => '',