Fix tests

Author: machour

codeception.yml

@@ -1,4 +1,4 @@
-namespace: machour\yii2\wpn\tests
+namespace: tests
 bootstrap: _bootstrap.php
 suites:
     unit:
@@ -20,5 +20,5 @@ paths:
     tests: tests
     output: tests/_output
     support: tests/_support
-    data: tests/_data
+    data: tests/fixtures/data
 

composer.json

@@ -24,7 +24,8 @@
         "codeception/codeception": "^4.1",
         "codeception/module-yii2": "^1.1",
         "codeception/module-phpbrowser": "^1.0.0",
-        "codeception/module-asserts": "^1.0.0"
+        "codeception/module-asserts": "^1.0.0",
+        "codeception/assert-throws": "^1.1"
     },
     "autoload": {
         "psr-4": {
@@ -33,7 +34,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "machour\\yii2\\wpn\\tests\\": "tests"
+            "tests\\": "tests"
         }
     },
     "repositories": [

src/helpers/WebPushNotifications.php renamed to src/components/Pusher.php

@@ -1,25 +1,44 @@
 <?php
 
-namespace machour\yii2\wpn\helpers;
+namespace machour\yii2\wpn\components;
 
+use machour\yii2\wpn\exceptions\InvalidApplication;
 use machour\yii2\wpn\models\WpnCampaign;
 use machour\yii2\wpn\models\WpnSubscription;
 use Minishlink\WebPush\WebPush;
 use Yii;
+use yii\base\BaseObject;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
 
 /**
  * @see https://autopush.readthedocs.io/en/latest/http.html#error-codes
  */
-class WebPushNotifications
+class Pusher extends BaseObject
 {
+    private $wp;
+
+    public function __construct(WebPush $wp, $config = [])
+    {
+        $this->wp = $wp;
+        parent::__construct($config);
+    }
+
+    public function test()
+    {
+        return $this->wp;
+    }
+
     /**
      * @throws \yii\db\Exception
      * @throws \ErrorException
      */
-    public static function sendPush(WpnCampaign $campaign)
+    public function sendPush(WpnCampaign $campaign)
     {
+        if (!$campaign->app->enabled) {
+            throw new InvalidApplication();
+        }
+
         $auth = [
             'VAPID' => [
                 'subject' => $campaign->app->subject,
@@ -28,16 +47,14 @@ public static function sendPush(WpnCampaign $campaign)
             ],
         ];
 
-        $webPush = new WebPush($auth);
-
         $payload = Json::encode($campaign->options);
 
         /** @var WpnSubscription[] $subscriptions */
         $subscriptions = ArrayHelper::map(WpnSubscription::find()->where(['subscribed' => true])->all(), 'endpoint', 'self');
 
         foreach ($subscriptions as $subscription) {
             try {
-                $webPush->queueNotification($subscription, $payload);
+                $this->wp->queueNotification($subscription, $payload, [], $auth);
             } catch (\Exception $e) {
                 $subscription->last_error = $e->getMessage();
                 $subscription->save();
@@ -48,7 +65,7 @@ public static function sendPush(WpnCampaign $campaign)
 
         $reports = [];
 
-        foreach ($webPush->flush() as $report) {
+        foreach ($this->wp->flush() as $report) {
             $endpoint = $report->getRequest()->getUri()->__toString();
             $subscription = $subscriptions[$endpoint];
             $spParams = [

src/controllers/DefaultController.php

@@ -3,7 +3,7 @@
 namespace machour\yii2\wpn\controllers;
 
 use machour\yii2\wpn\exceptions\SubscriptionNotFound;
-use machour\yii2\wpn\helpers\WebPushNotifications;
+use machour\yii2\wpn\helpers\Pusher;
 use machour\yii2\wpn\models\WpnCampaign;
 use machour\yii2\wpn\models\WpnSubscription;
 use machour\yii2\wpn\models\WpnReport;
@@ -156,6 +156,6 @@ public function actionServiceWorker(): string
 
     private function actionPush($id)
     {
-        WebPushNotifications::sendPush(WpnCampaign::findOne($id));
+        Pusher::sendPush(WpnCampaign::findOne($id));
     }
 }

src/exceptions/InvalidApplication.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace machour\yii2\wpn\exceptions;
+
+use yii\base\Exception;
+
+class InvalidApplication extends Exception
+{
+    public $message = 'Application disabled';
+}

tests/MyTest.php

@@ -1,32 +1,52 @@
 <?php
-namespace machour\yii2\wpn\tests;
 
-use machour\yii2\wpn\tests\fixtures\WpnAppFixture;
+namespace tests;
+
+use machour\yii2\wpn\exceptions\InvalidApplication;
+use machour\yii2\wpn\Module;
+use Minishlink\WebPush\WebPush;
+use tests\fixtures\WpnAppFixture;
+use tests\fixtures\WpnCampaignFixture;
 
 class MyTest extends \Codeception\Test\Unit
 {
+    use \Codeception\AssertThrows;
+
     /**
-     * @var \machour\yii2\wpn\tests\UnitTester
+     * @var UnitTester
      */
     protected $tester;
 
+    protected $pusher;
+
     protected function _before()
     {
         $this->tester->haveFixtures([
-            'user' => [
+            'app' => [
                 'class' => WpnAppFixture::class,
-                'dataFile' => codecept_data_dir() . 'wpn_app.php'
-            ]
+                'dataFile' => codecept_data_dir() . 'wpn_app.php',
+            ],
+            'campaign' => [
+                'class' => WpnCampaignFixture::class,
+            ],
         ]);
+
+        $module = Module::getInstance();
+        $this->pusher = $module->get('pusher');
+
     }
 
     protected function _after()
     {
+
     }
 
     // tests
-    public function testSomeFeature()
+    public function testRefusingDisabledApplication()
     {
-
+        $invalidApplication = $this->tester->grabFixture('campaign', 1);
+        $this->assertThrows(InvalidApplication::class, function() use ($invalidApplication) {
+            $this->pusher->sendPush($invalidApplication);
+        });
     }
 }

tests/_bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+
 define('YII_ENV', 'test');
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 

tests/_support/Helper/Unit.php

@@ -1,5 +1,5 @@
 <?php
-namespace machour\yii2\wpn\tests\Helper;
+namespace tests\Helper;
 
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I

tests/_support/UnitTester.php

@@ -1,5 +1,5 @@
 <?php
-namespace machour\yii2\wpn\tests;
+namespace tests;
 
 /**
  * Inherited Methods

tests/_support/_generated/UnitTesterActions.php

@@ -1,5 +1,5 @@
 <?php  //[STAMP] 194c562054d7b0475f5c9c66c98d6bd8
-namespace machour\yii2\wpn\tests\_generated;
+namespace tests\_generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build

tests/config.php

@@ -5,6 +5,7 @@
 return [
     'id' => 'wpn-tests',
     'basePath' => dirname(__DIR__),
+    'bootstrap' => ['wpn'],
     'components' => [
         'db' => [
             'class' => Connection::class,
@@ -14,5 +15,15 @@
             'enableSchemaCache' => true,
             'charset' => 'latin1',
         ],
+    ],
+    'modules' => [
+        'wpn' => [
+            'class' => \machour\yii2\wpn\Module::class,
+            'components' => [
+                'pusher' => [
+                    'class' => \machour\yii2\wpn\components\Pusher::class,
+                ]
+            ]
+        ]
     ]
 ];

tests/fixtures/WpnAppFixture.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace machour\yii2\wpn\tests\fixtures;
+namespace tests\fixtures;
 
 use machour\yii2\wpn\models\WpnApp;
 use yii\test\ActiveFixture;

tests/fixtures/WpnCampaignFixture.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace tests\fixtures;
+
+use machour\yii2\wpn\models\WpnCampaign;
+use yii\test\ActiveFixture;
+
+class WpnCampaignFixture extends ActiveFixture
+{
+    public $modelClass = WpnCampaign::class;
+}

tests/fixtures/data/wpn_app.php

@@ -3,8 +3,24 @@
 return [
     [
         'id' => 1,
-        'name' => 'Test App',
+        'name' => 'Valid App',
         'host' => 'localhost',
-        'subject' => 'mailto:example@localhost.com'
-    ]
+        'subject' => 'mailto:example@localhost.com',
+        'public_key' => 'BPNOgWF76BVzSYpRWDWV3SVc9wvZgfvImhhSQNLYGRs_Zfy5rEXb5NITVoUzbEoe9E85oO2830ftuZfwjmHr0FE',
+        'private_key' => 'KRbzYHPtD54HPyXP6bkqavNUiTGKls8C0rLyAk7fCoU',
+        'enabled' => true,
+        'created_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+    ],
+    [
+        'id' => 2,
+        'name' => 'Disabled App',
+        'host' => 'localhost2',
+        'subject' => 'mailto:example@localhost.com',
+        'public_key' => 'BPNOgWF76BVzSYpRWDWV3SVc9wvZgfvImhhSQNLYGRs_Zfy5rEXb5NITVoUzbEoe9E85oO2830ftuZfwjmHr0FE',
+        'private_key' => 'KRbzYHPtD54HPyXP6bkqavNUiTGKls8C0rLyAk7fCoU',
+        'enabled' => false,
+        'created_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+    ],
 ];

tests/fixtures/data/wpn_campaign.php

@@ -0,0 +1,24 @@
+<?php
+
+return [
+    [
+        'id' => 1,
+        'app_id' => 1,
+        'title' => 'Push on valid application',
+        'tag' => 'push-1',
+        'body' => 'My push body',
+        'created_at' => date('Y-m-d H:i:s'),
+        'scheduled_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+    ],
+    [
+        'id' => 2,
+        'app_id' => 2,
+        'title' => 'Push on invalid application',
+        'tag' => 'push-2',
+        'body' => 'My push body',
+        'created_at' => date('Y-m-d H:i:s'),
+        'scheduled_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+    ],
+];

yii_test

@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
+
+$config = require __DIR__ . '/tests/config.php';
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);