summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-02-09 10:07:59 +0100
committerGitHub <noreply@github.com>2017-02-09 10:07:59 +0100
commitac841ee002b7984288a67f845d23777bcf0caa4d (patch)
treeb771628dfbbd62d2080e304bc6e8f2f08b392e9a /tests
parent3c4b539fdf05a47c87a8088550776cdd7bd0707d (diff)
parent5e728d0eda85710b667b6399dbae8c2cbab8e72d (diff)
downloadnextcloud-server-ac841ee002b7984288a67f845d23777bcf0caa4d.tar.gz
nextcloud-server-ac841ee002b7984288a67f845d23777bcf0caa4d.zip
Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
oc_token should be nc_token
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/LoginControllerTest.php4
-rw-r--r--tests/lib/AppFramework/Http/RequestTest.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index a1a4452abf8..72f921724a5 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -89,7 +89,7 @@ class LoginControllerTest extends TestCase {
$this->request
->expects($this->once())
->method('getCookie')
- ->with('oc_token')
+ ->with('nc_token')
->willReturn(null);
$this->config
->expects($this->never())
@@ -108,7 +108,7 @@ class LoginControllerTest extends TestCase {
$this->request
->expects($this->once())
->method('getCookie')
- ->with('oc_token')
+ ->with('nc_token')
->willReturn('MyLoginToken');
$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
$user
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index b1515b0efb5..6c6504b4de8 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -1651,7 +1651,7 @@ class RequestTest extends \Test\TestCase {
'HTTP_REQUESTTOKEN' => 'AAAHGxsTCTc3BgMQESAcNR0OAR0=:MyTotalSecretShareds',
],
'cookies' => [
- 'oc_token' => 'asdf',
+ 'nc_token' => 'asdf',
],
],
$this->secureRandom,