Merge remote-tracking branch 'origin/master' into 2.4

2019-01-15 09:41:18 +01:00
parent 5c331bf0f9 f6b9e883c0
commit 5419a8368e
61 changed files with 3813 additions and 1509 deletions
--- a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
@ -56,6 +56,20 @@ class DeveloperControllerTest extends WallabagCoreTestCase
        $this->assertArrayHasKey('refresh_token', $data);
    }

+    public function testCreateTokenWithBadClientId()
+    {
+        $client = $this->getClient();
+        $client->request('POST', '/oauth/v2/token', [
+            'grant_type' => 'password',
+            'client_id' => '$WALLABAG_CLIENT_ID',
+            'client_secret' => 'secret',
+            'username' => 'admin',
+            'password' => 'mypassword',
+        ]);
+
+        $this->assertSame(400, $client->getResponse()->getStatusCode());
+    }
+
    public function testListingClient()
    {
        $this->logInAs('admin');