diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acceptance/features/bootstrap/LoginPageContext.php | 4 | ||||
| -rw-r--r-- | tests/lib/Files/Storage/HomeStorageQuotaTest.php | 84 |
2 files changed, 2 insertions, 86 deletions
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/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(); - } -} |