aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-12-01 22:17:19 +0100
committerJoas Schilling <coding@schilljs.com>2021-12-01 22:17:19 +0100
commitc6ae53096c36e6a475467eaeb6df00ac8d38e4b2 (patch)
tree80deaa0d05a26564937a03d430197d1f6a57d30b /apps/settings
parent9f001790379829096939015e790f0a35b6a38787 (diff)
downloadnextcloud-server-c6ae53096c36e6a475467eaeb6df00ac8d38e4b2.tar.gz
nextcloud-server-c6ae53096c36e6a475467eaeb6df00ac8d38e4b2.zip
More test fixing
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/tests/Controller/AuthSettingsControllerTest.php18
-rw-r--r--apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php8
2 files changed, 13 insertions, 13 deletions
diff --git a/apps/settings/tests/Controller/AuthSettingsControllerTest.php b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
index 477d0fcc8f5..b744b942e09 100644
--- a/apps/settings/tests/Controller/AuthSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
@@ -32,10 +32,10 @@ namespace Test\Settings\Controller;
use OC\AppFramework\Http;
use OC\Authentication\Exceptions\ExpiredTokenException;
use OC\Authentication\Exceptions\InvalidTokenException;
-use OC\Authentication\Token\DefaultToken;
use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
use OC\Authentication\Token\IWipeableToken;
+use OC\Authentication\Token\PublicKeyToken;
use OC\Authentication\Token\RemoteWipe;
use OCA\Settings\Controller\AuthSettingsController;
use OCP\Activity\IEvent;
@@ -178,7 +178,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testDestroy() {
$tokenId = 124;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
$this->mockActivityManager();
@@ -200,7 +200,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testDestroyExpired() {
$tokenId = 124;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$token->expects($this->exactly(2))
->method('getId')
@@ -224,7 +224,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testDestroyWrongUser() {
$tokenId = 124;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
@@ -252,7 +252,7 @@ class AuthSettingsControllerTest extends TestCase {
*/
public function testUpdateRename(string $name, string $newName): void {
$tokenId = 42;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
$this->mockActivityManager();
@@ -295,7 +295,7 @@ class AuthSettingsControllerTest extends TestCase {
*/
public function testUpdateFilesystemScope(bool $filesystem, bool $newFilesystem): void {
$tokenId = 42;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
$this->mockActivityManager();
@@ -325,7 +325,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testUpdateNoChange(): void {
$tokenId = 42;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
@@ -356,7 +356,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testUpdateExpired() {
$tokenId = 42;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$token->expects($this->once())
->method('getUID')
@@ -376,7 +376,7 @@ class AuthSettingsControllerTest extends TestCase {
public function testUpdateTokenWrongUser() {
$tokenId = 42;
- $token = $this->createMock(DefaultToken::class);
+ $token = $this->createMock(PublicKeyToken::class);
$this->mockGetTokenById($tokenId, $token);
diff --git a/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php b/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
index 3ee39c3624c..8fae0a44d8f 100644
--- a/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
+++ b/apps/settings/tests/Settings/Personal/Security/AuthtokensTest.php
@@ -25,8 +25,8 @@ declare(strict_types=1);
*/
namespace OCA\Settings\Tests\Settings\Personal\Security;
-use OC\Authentication\Token\DefaultToken;
use OC\Authentication\Token\IProvider as IAuthTokenProvider;
+use OC\Authentication\Token\PublicKeyToken;
use OCA\Settings\Settings\Personal\Security\Authtokens;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
@@ -74,15 +74,15 @@ class AuthtokensTest extends TestCase {
}
public function testGetForm() {
- $token1 = new DefaultToken();
+ $token1 = new PublicKeyToken();
$token1->setId(100);
- $token2 = new DefaultToken();
+ $token2 = new PublicKeyToken();
$token2->setId(200);
$tokens = [
$token1,
$token2,
];
- $sessionToken = new DefaultToken();
+ $sessionToken = new PublicKeyToken();
$sessionToken->setId(100);
$this->authTokenProvider->expects($this->once())