diff options
Diffstat (limited to 'tests/Wallabag')
3 files changed, 15 insertions, 4 deletions
diff --git a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php index 8f87ccf3..3c94382c 100644 --- a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php +++ b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php | |||
@@ -85,7 +85,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase | |||
85 | 'text' => 'my annotation', | 85 | 'text' => 'my annotation', |
86 | 'quote' => 'my quote', | 86 | 'quote' => 'my quote', |
87 | 'ranges' => [ | 87 | 'ranges' => [ |
88 | ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31] | 88 | ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31], |
89 | ], | 89 | ], |
90 | ]); | 90 | ]); |
91 | $this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content); | 91 | $this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content); |
@@ -130,7 +130,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase | |||
130 | 'text' => 'my annotation', | 130 | 'text' => 'my annotation', |
131 | 'quote' => $longQuote, | 131 | 'quote' => $longQuote, |
132 | 'ranges' => [ | 132 | 'ranges' => [ |
133 | ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31] | 133 | ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31], |
134 | ], | 134 | ], |
135 | ]); | 135 | ]); |
136 | $this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content); | 136 | $this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content); |
diff --git a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php index 5735bc58..4e65f130 100644 --- a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php +++ b/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php | |||
@@ -61,10 +61,16 @@ class UserRestControllerTest extends WallabagApiTestCase | |||
61 | $this->assertArrayHasKey('username', $content); | 61 | $this->assertArrayHasKey('username', $content); |
62 | $this->assertArrayHasKey('created_at', $content); | 62 | $this->assertArrayHasKey('created_at', $content); |
63 | $this->assertArrayHasKey('updated_at', $content); | 63 | $this->assertArrayHasKey('updated_at', $content); |
64 | $this->assertArrayHasKey('default_client', $content); | ||
64 | 65 | ||
65 | $this->assertEquals('wallabag@google.com', $content['email']); | 66 | $this->assertEquals('wallabag@google.com', $content['email']); |
66 | $this->assertEquals('google', $content['username']); | 67 | $this->assertEquals('google', $content['username']); |
67 | 68 | ||
69 | $this->assertArrayHasKey('client_secret', $content['default_client']); | ||
70 | $this->assertArrayHasKey('client_id', $content['default_client']); | ||
71 | |||
72 | $this->assertEquals('Default client', $content['default_client']['name']); | ||
73 | |||
68 | $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type')); | 74 | $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type')); |
69 | 75 | ||
70 | $this->client->getContainer()->get('craue_config')->set('api_user_registration', 0); | 76 | $this->client->getContainer()->get('craue_config')->set('api_user_registration', 0); |
@@ -79,6 +85,7 @@ class UserRestControllerTest extends WallabagApiTestCase | |||
79 | 'username' => 'google', | 85 | 'username' => 'google', |
80 | 'password' => 'googlegoogle', | 86 | 'password' => 'googlegoogle', |
81 | 'email' => 'wallabag@google.com', | 87 | 'email' => 'wallabag@google.com', |
88 | 'client_name' => 'My client name !!', | ||
82 | ]); | 89 | ]); |
83 | 90 | ||
84 | $this->assertEquals(201, $client->getResponse()->getStatusCode()); | 91 | $this->assertEquals(201, $client->getResponse()->getStatusCode()); |
@@ -90,10 +97,16 @@ class UserRestControllerTest extends WallabagApiTestCase | |||
90 | $this->assertArrayHasKey('username', $content); | 97 | $this->assertArrayHasKey('username', $content); |
91 | $this->assertArrayHasKey('created_at', $content); | 98 | $this->assertArrayHasKey('created_at', $content); |
92 | $this->assertArrayHasKey('updated_at', $content); | 99 | $this->assertArrayHasKey('updated_at', $content); |
100 | $this->assertArrayHasKey('default_client', $content); | ||
93 | 101 | ||
94 | $this->assertEquals('wallabag@google.com', $content['email']); | 102 | $this->assertEquals('wallabag@google.com', $content['email']); |
95 | $this->assertEquals('google', $content['username']); | 103 | $this->assertEquals('google', $content['username']); |
96 | 104 | ||
105 | $this->assertArrayHasKey('client_secret', $content['default_client']); | ||
106 | $this->assertArrayHasKey('client_id', $content['default_client']); | ||
107 | |||
108 | $this->assertEquals('My client name !!', $content['default_client']['name']); | ||
109 | |||
97 | $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-Type')); | 110 | $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-Type')); |
98 | 111 | ||
99 | $client->getContainer()->get('craue_config')->set('api_user_registration', 0); | 112 | $client->getContainer()->get('craue_config')->set('api_user_registration', 0); |
diff --git a/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php b/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php index 3b928d1e..c0a4acfa 100644 --- a/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php | |||
@@ -4,10 +4,8 @@ namespace Tests\Wallabag\CoreBundle\Command; | |||
4 | 4 | ||
5 | use Symfony\Bundle\FrameworkBundle\Console\Application; | 5 | use Symfony\Bundle\FrameworkBundle\Console\Application; |
6 | use Symfony\Component\Console\Tester\CommandTester; | 6 | use Symfony\Component\Console\Tester\CommandTester; |
7 | use Wallabag\CoreBundle\Command\CleanDuplicatesCommand; | ||
8 | use Tests\Wallabag\CoreBundle\WallabagCoreTestCase; | 7 | use Tests\Wallabag\CoreBundle\WallabagCoreTestCase; |
9 | use Wallabag\CoreBundle\Command\ShowUserCommand; | 8 | use Wallabag\CoreBundle\Command\ShowUserCommand; |
10 | use Wallabag\CoreBundle\Entity\Entry; | ||
11 | use Wallabag\UserBundle\Entity\User; | 9 | use Wallabag\UserBundle\Entity\User; |
12 | 10 | ||
13 | class ShowUserCommandTest extends WallabagCoreTestCase | 11 | class ShowUserCommandTest extends WallabagCoreTestCase |