diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
| commit | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch) | |
| tree | f87a5586086635d4cbd18771b442ee771f79e441 /tests/lib/User | |
| parent | 8e002b61554308cb4d50570f715303a82136f0fa (diff) | |
| parent | 2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff) | |
| download | nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'tests/lib/User')
| -rw-r--r-- | tests/lib/User/SessionTest.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php index 447c6142f34..9bde2c664b6 100644 --- a/tests/lib/User/SessionTest.php +++ b/tests/lib/User/SessionTest.php @@ -729,6 +729,9 @@ class SessionTest extends \Test\TestCase { $this->assertFalse($userSession->createSessionToken($request, $uid, $loginName, $password)); } + /** + * @expectedException \OC\User\LoginException + */ public function testTryTokenLoginWithDisabledUser() { $manager = $this->getMockBuilder('\OC\User\Manager') ->disableOriginalConstructor() @@ -761,7 +764,7 @@ class SessionTest extends \Test\TestCase { ->method('isEnabled') ->will($this->returnValue(false)); - $this->assertFalse($userSession->tryTokenLogin($request)); + $userSession->tryTokenLogin($request); } public function testValidateSessionDisabledUser() { |