diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /tests/Wallabag/UserBundle | |
parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'tests/Wallabag/UserBundle')
-rw-r--r-- | tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php index 441d6519..21412da6 100644 --- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php +++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php | |||
@@ -26,7 +26,6 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase | |||
26 | protected $mailer; | 26 | protected $mailer; |
27 | protected $spool; | 27 | protected $spool; |
28 | protected $twig; | 28 | protected $twig; |
29 | protected $config; | ||
30 | 29 | ||
31 | protected function setUp() | 30 | protected function setUp() |
32 | { | 31 | { |
@@ -44,14 +43,6 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase | |||
44 | TWIG; | 43 | TWIG; |
45 | 44 | ||
46 | $this->twig = new \Twig_Environment(new \Twig_Loader_Array(['WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate])); | 45 | $this->twig = new \Twig_Environment(new \Twig_Loader_Array(['WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate])); |
47 | |||
48 | $this->config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config') | ||
49 | ->disableOriginalConstructor() | ||
50 | ->getMock(); | ||
51 | |||
52 | $this->config->expects($this->any()) | ||
53 | ->method('get') | ||
54 | ->willReturn('http://0.0.0.0/support'); | ||
55 | } | 46 | } |
56 | 47 | ||
57 | public function testSendEmail() | 48 | public function testSendEmail() |
@@ -67,7 +58,8 @@ TWIG; | |||
67 | $this->twig, | 58 | $this->twig, |
68 | 'nobody@test.io', | 59 | 'nobody@test.io', |
69 | 'wallabag test', | 60 | 'wallabag test', |
70 | $this->config | 61 | 'http://0.0.0.0/support', |
62 | 'http://0.0.0.0/' | ||
71 | ); | 63 | ); |
72 | 64 | ||
73 | $authCodeMailer->sendAuthCode($user); | 65 | $authCodeMailer->sendAuthCode($user); |