fix some tests

Koc · Koc · commit 2b8200a23b14 · 2019-06-30T23:15:23.000+03:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Tests/GmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Google/Tests/GmailTransportFactoryTest.php
@@ -41,6 +41,6 @@ public function createProvider(): iterable
 
     public function unsupportedSchemeProvider(): iterable
     {
-        yield [new Dsn('api', 'gmail', null, self::USER, self::PASS)];
+        yield [new Dsn('http', 'gmail', null, self::USER, self::PASS)];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php
@@ -11,28 +11,42 @@
 
 namespace Symfony\Component\Mailer\Tests\Transport;
 
+use Symfony\Component\Mailer\Bridge\Sendgrid\Factory\SendgridTransportFactory;
 use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
+use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\SendmailTransport;
 use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
 
 class SendmailTransportFactoryTest extends TransportFactoryTestCase
 {
     public function getFactory(): TransportFactoryInterface
     {
-        // TODO: Implement getFactory() method.
+        return new SendgridTransportFactory($this->eventDispatcher, $this->httpClient, $this->logger);
     }
 
     public function supportsProvider(): iterable
     {
-        // TODO: Implement supportsProvider() method.
+        yield [
+            new Dsn('smtp', 'sendmail', null, null, null),
+            true,
+        ];
+
+        yield [
+            new Dsn('smtp', 'dummy', null, null, null),
+            false,
+        ];
     }
 
     public function createProvider(): iterable
     {
-        // TODO: Implement createProvider() method.
+        yield [
+            new Dsn('smtp', 'sendmail', null, null, null),
+            new SendmailTransport(null, $this->eventDispatcher, $this->logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
-        // TODO: Implement unsupportedSchemeProvider() method.
+        yield [new Dsn('http', 'sendmail', null, null, null)];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/TransportFactoryTestCase.php b/src/Symfony/Component/Mailer/Tests/TransportFactoryTestCase.php
@@ -60,7 +60,7 @@ public function testUnsupportedSchemeException(Dsn $dsn): void
     {
         $factory = $this->getFactory();
 
-        $this->expectsException(UnsupportedSchemeException::class);
+        $this->expectException(UnsupportedSchemeException::class);
         $factory->create($dsn);
     }
 
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -62,20 +62,6 @@ public function testFromInvalidTransportName()
         Transport::fromDsn('api://foobar');
     }
 
-    public function testFromDsnGmail()
-    {
-        $dispatcher = $this->createMock(EventDispatcherInterface::class);
-        $logger = $this->createMock(LoggerInterface::class);
-        $transport = Transport::fromDsn('smtp://'.urlencode('u$er').':'.urlencode('pa$s').'@gmail', $dispatcher, null, $logger);
-        $this->assertInstanceOf(Google\Smtp\GmailTransport::class, $transport);
-        $this->assertEquals('u$er', $transport->getUsername());
-        $this->assertEquals('pa$s', $transport->getPassword());
-        $this->assertProperties($transport, $dispatcher, $logger);
-
-        $this->expectException(LogicException::class);
-        Transport::fromDsn('http://gmail');
-    }
-
     public function testFromDsnMailgun()
     {
         $dispatcher = $this->createMock(EventDispatcherInterface::class);

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public function createProvider(): iterable`
`41`	`41`
`42`	`42`	`public function unsupportedSchemeProvider(): iterable`
`43`	`43`	`{`
`44`		`- yield [new Dsn('api', 'gmail', null, self::USER, self::PASS)];`
	`44`	`+ yield [new Dsn('http', 'gmail', null, self::USER, self::PASS)];`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,28 +11,42 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Mailer\Tests\Transport;`
`13`	`13`
	`14`	`+use Symfony\Component\Mailer\Bridge\Sendgrid\Factory\SendgridTransportFactory;`
`14`	`15`	`use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;`
	`16`	`+use Symfony\Component\Mailer\Transport\Dsn;`
	`17`	`+use Symfony\Component\Mailer\Transport\SendmailTransport;`
`15`	`18`	`use Symfony\Component\Mailer\Transport\TransportFactoryInterface;`
`16`	`19`
`17`	`20`	`class SendmailTransportFactoryTest extends TransportFactoryTestCase`
`18`	`21`	`{`
`19`	`22`	`public function getFactory(): TransportFactoryInterface`
`20`	`23`	`{`
`21`		`- // TODO: Implement getFactory() method.`
	`24`	`+ return new SendgridTransportFactory($this->eventDispatcher, $this->httpClient, $this->logger);`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public function supportsProvider(): iterable`
`25`	`28`	`{`
`26`		`- // TODO: Implement supportsProvider() method.`
	`29`	`+ yield [`
	`30`	`+ new Dsn('smtp', 'sendmail', null, null, null),`
	`31`	`+ true,`
	`32`	`+ ];`
	`33`	`+`
	`34`	`+ yield [`
	`35`	`+ new Dsn('smtp', 'dummy', null, null, null),`
	`36`	`+ false,`
	`37`	`+ ];`
`27`	`38`	`}`
`28`	`39`
`29`	`40`	`public function createProvider(): iterable`
`30`	`41`	`{`
`31`		`- // TODO: Implement createProvider() method.`
	`42`	`+ yield [`
	`43`	`+ new Dsn('smtp', 'sendmail', null, null, null),`
	`44`	`+ new SendmailTransport(null, $this->eventDispatcher, $this->logger),`
	`45`	`+ ];`
`32`	`46`	`}`
`33`	`47`
`34`	`48`	`public function unsupportedSchemeProvider(): iterable`
`35`	`49`	`{`
`36`		`- // TODO: Implement unsupportedSchemeProvider() method.`
	`50`	`+ yield [new Dsn('http', 'sendmail', null, null, null)];`
`37`	`51`	`}`
`38`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testUnsupportedSchemeException(Dsn $dsn): void`
`60`	`60`	`{`
`61`	`61`	`$factory = $this->getFactory();`
`62`	`62`
`63`		`- $this->expectsException(UnsupportedSchemeException::class);`
	`63`	`+ $this->expectException(UnsupportedSchemeException::class);`
`64`	`64`	`$factory->create($dsn);`
`65`	`65`	`}`
`66`	`66`