Fix tests

UseMuffin · Aug 30, 2016 · 6b27800 · 6b27800
1 parent 9a479b7
commit 6b27800
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/tests/TestCase/Auth/OAuthAuthenticateTest.php b/tests/TestCase/Auth/OAuthAuthenticateTest.php
@@ -251,7 +251,12 @@ public function testNormalizeConfig1()
 
     public function testGetUserWithMissingOrAlteredQueryState()
     {
-        $provider = $this->getMockBuilder('League\OAuth2\Client\Provider\Github', [], [], '', false)->getMock();
+        $this->oauth->config($this->oauth->normalizeConfig($this->config));
+        $this->oauth->config($this->oauth->config('providers.github'), false);
+
+        $provider = $this->getMockBuilder('League\OAuth2\Client\Provider\Github')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->oauth->expects($this->any())
             ->method('provider')
@@ -296,7 +301,9 @@ public function testGetUser()
             ->method('toArray')
             ->will($this->returnValue(['login' => 'foo']));
 
-        $provider = $this->getMockBuilder('League\OAuth2\Client\Provider\Github', [], [], '', false)->getMock();
+        $provider = $this->getMockBuilder('League\OAuth2\Client\Provider\Github')
+            ->disableOriginalConstructor()
+            ->getMock();
         $provider->expects($this->once())
             ->method('getAccessToken')
             ->with('authorization_code', ['code' => 'bar'])
@@ -354,7 +361,9 @@ public function testUnauthenticated()
         $result = $oauth->unauthenticated($request, $response);
         $this->assertNull($result);
 
-        $session = $this->getMockBuilder('Cake\Network\Session', ['write'])->getMock();
+        $session = $this->getMockBuilder('Cake\Network\Session')
+            ->setMethods(['write'])
+            ->getMock();
         $session->expects($this->once())
             ->method('write')
             ->with('oauth2state', 'foobar');