Skip to content
GitLab
Commit 1b94570b authored by Yamilov Stepan's avatar Yamilov Stepan :motorcycle:
Browse files

Added phpunit as dev dependency and fix some errors in tests

parent 98239750
master 0.10.1 0.10.0
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 828 additions and 65 deletions
+828 -65
Tests/Mailer/MailerManagerTest.php
+ 37
- 32
View file @ 1b94570b
......@@ -21,18 +21,21 @@ class MailerManagerTest extends DatabaseTestCase
return array(
array(array()),
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
)),
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject',
)),
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'body' => 'Body',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'body' => 'Body',
)),
);
}
......@@ -41,16 +44,18 @@ class MailerManagerTest extends DatabaseTestCase
{
return array(
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1',
)),
array(array(
'from' => 'smirik+from2@gmail.com',
'to' => 'smirik+to2@gmail.com',
'subject' => 'Test Subject 2',
'body' => 'Body 2',
'from_email' => 'smirik+from2@gmail.com',
'from_name' => 'Test2 Profi.Travel',
'to' => 'smirik+to2@gmail.com',
'subject' => 'Test Subject 2',
'body' => 'Body 2',
)),
);
}
......@@ -59,23 +64,23 @@ class MailerManagerTest extends DatabaseTestCase
{
return array(
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1 <img src="{{image}}">',
'attachments' => array(
array(
'is_embedded' => true,
'key' => '{{image}}',
'value' => dirname(__FILE__).'/../../Resources/fixtures/images/demo.png',
)
),
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1 <img src="{{image}}">',
'attachments' => array(
array(
'is_embedded' => true,
'key' => '{{image}}',
'value' => dirname(__FILE__).'/../../Resources/fixtures/images/demo.png',
)
),
)),
);
}
}
/**
* @expectedException Smirik\MailerBundle\Mailer\MailerKeyNotFoundException
* @dataProvider exceptionProvider
*/
public function testAddToQueueException($options)
......@@ -90,7 +95,8 @@ class MailerManagerTest extends DatabaseTestCase
{
$mail = $this->manager->addToQueue($options);
$this->assertTrue(in_array($mail->getId(), array(4, 5)));
$this->assertEquals($options['from'], $mail->getFrom());
$this->assertEquals($options['from_email'], $mail->getFromEmail());
$this->assertEquals($options['from_name'], $mail->getFromName());
$this->assertEquals($options['to'], $mail->getTo());
$this->assertEquals($options['subject'], $mail->getSubject());
$this->assertEquals($options['body'], $mail->getBody());
......@@ -119,5 +125,4 @@ class MailerManagerTest extends DatabaseTestCase
$message->fromArray($options);
$this->manager->sendNow($message);
}
}
Tests/Mailer/MessageTest.php
+ 12
- 9
View file @ 1b94570b
......@@ -12,16 +12,18 @@ class MessageTest extends \PHPUnit_Framework_TestCase
{
return array(
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1',
)),
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 2',
'body' => 'Body 2',
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 2',
'body' => 'Body 2',
)),
);
}
......@@ -37,7 +39,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase
$message->fromArray($options);
$this->assertEquals($options['from'], $message->getFrom());
$this->assertEquals($options['from_email'], $message->getFromEmail());
$this->assertEquals($options['from_name'], $message->getFromName());
$this->assertEquals($options['to'], $message->getTo());
$this->assertEquals($options['subject'], $message->getSubject());
$this->assertEquals($options['body'], $message->getBody());
......
Tests/Mailer/SenderTest.php
+ 12
- 22
View file @ 1b94570b
......@@ -15,30 +15,22 @@ class SenderTest extends \PHPUnit_Framework_TestCase
parent::__construct($name, $data, $dataName);
}
/**
* @expectedException Smirik\MailerBundle\Mailer\MailerMessageInterfaceNotImplemented
*/
public function testToSwiftMailerMessageInterfaceNotImplemented()
{
$this->assertEquals(true, $this->sender->toSwift(new \stdClass));
}
public static function toSwiftProvider()
{
return array(
array(array(
'from' => 'smirik+from@gmail.com',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1 {{ image }}',
'attachments' => array(
array(
'is_embedded' => true,
'key' => 'image',
'value' => dirname(__FILE__).'/../Resources/fixtures/images/demo.png',
)
),
'from_email' => 'smirik+from@gmail.com',
'from_name' => 'Test Profi.Travel',
'to' => 'smirik+to@gmail.com',
'subject' => 'Test Subject 1',
'body' => 'Body 1 {{ image }}',
'attachments' => array(
array(
'is_embedded' => true,
'key' => 'image',
'value' => dirname(__FILE__).'/../Resources/fixtures/images/demo.png',
)
),
)),
);
}
......@@ -55,6 +47,4 @@ class SenderTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($swift instanceOf \Swift_Message);
$this->assertTrue((bool)strstr($swift->getBody(), 'Body 1'));
}
}
composer.json
+ 1
- 0
View file @ 1b94570b
......@@ -15,6 +15,7 @@
"require": {
},
"require-dev": {
"phpunit/phpunit": "4.3.5",
"propel/propel-bundle": "1.2.*@dev",
"symfony/framework-bundle": "2.3.*",
"symfony/swiftmailer-bundle": "2.2.*"
......
composer.lock
+ 748
- 2
View file @ 1b94570b
This diff is collapsed.
phpunit.xml.dist 0 → 100644
+ 18
- 0
View file @ 1b94570b
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="./vendor/autoload.php">
<testsuites>
<testsuite name="Smirik Mailer Bundle Test Suite">
<directory>./Tests</directory>
</testsuite>
</testsuites>
</phpunit>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment