diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-09-29 11:35:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-29 11:35:47 +0200 |
commit | fb479be3a0af95bba45c13b11e1f85bb9c753d25 (patch) | |
tree | 4570e7d48f58a78b0da54090fe2a4d4996ec5683 /tests/Wallabag | |
parent | 37b63c170d700db5d248a33fcf9aca9d41473ec0 (diff) | |
parent | 2d8af6fc7fe32dd8788cb89f8c3aec9269cbe33c (diff) | |
download | wallabag-fb479be3a0af95bba45c13b11e1f85bb9c753d25.tar.gz wallabag-fb479be3a0af95bba45c13b11e1f85bb9c753d25.tar.zst wallabag-fb479be3a0af95bba45c13b11e1f85bb9c753d25.zip |
Merge pull request #2315 from wallabag/fixes-about-upgrade
Fixes about upgrade
Diffstat (limited to 'tests/Wallabag')
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/TagControllerTest.php | 4 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/WallabagCoreTestCase.php | 2 | ||||
-rw-r--r-- | tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php index 71652760..2c32393f 100644 --- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php | |||
@@ -47,7 +47,7 @@ class TagControllerTest extends WallabagCoreTestCase | |||
47 | 47 | ||
48 | $this->assertEquals(1, count($entry->getTags())); | 48 | $this->assertEquals(1, count($entry->getTags())); |
49 | 49 | ||
50 | # tag already exists and already assigned | 50 | // tag already exists and already assigned |
51 | $client->submit($form, $data); | 51 | $client->submit($form, $data); |
52 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | 52 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); |
53 | 53 | ||
@@ -58,7 +58,7 @@ class TagControllerTest extends WallabagCoreTestCase | |||
58 | 58 | ||
59 | $this->assertEquals(1, count($newEntry->getTags())); | 59 | $this->assertEquals(1, count($newEntry->getTags())); |
60 | 60 | ||
61 | # tag already exists but still not assigned to this entry | 61 | // tag already exists but still not assigned to this entry |
62 | $data = [ | 62 | $data = [ |
63 | 'tag[label]' => 'foo', | 63 | 'tag[label]' => 'foo', |
64 | ]; | 64 | ]; |
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php index 75b7ee0b..4f103921 100644 --- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php +++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php | |||
@@ -83,7 +83,7 @@ abstract class WallabagCoreTestCase extends WebTestCase | |||
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Check if Redis is installed. | 85 | * Check if Redis is installed. |
86 | * If not, mark test as skip | 86 | * If not, mark test as skip. |
87 | */ | 87 | */ |
88 | protected function checkRedis() | 88 | protected function checkRedis() |
89 | { | 89 | { |
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php index f670c925..441d6519 100644 --- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php +++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php | |||
@@ -37,7 +37,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase | |||
37 | ); | 37 | ); |
38 | $this->mailer = new \Swift_Mailer($transport); | 38 | $this->mailer = new \Swift_Mailer($transport); |
39 | 39 | ||
40 | $twigTemplate = <<<TWIG | 40 | $twigTemplate = <<<'TWIG' |
41 | {% block subject %}subject{% endblock %} | 41 | {% block subject %}subject{% endblock %} |
42 | {% block body_html %}html body {{ code }}{% endblock %} | 42 | {% block body_html %}html body {{ code }}{% endblock %} |
43 | {% block body_text %}text body {{ support_url }}{% endblock %} | 43 | {% block body_text %}text body {{ support_url }}{% endblock %} |