Fixing up tests to hopefully pass

Author: Matt Gaunt

CONTRIBUTING.md

@@ -20,8 +20,4 @@ following commands:
 **For a Single Test**
     `php phpunit.phar . --filter "/::testPadPayload( .*)?$/"` (regex)
 
-Some tests have a custom decorator @skipIfTravis. The reason is that
-there's no way in Travis to update the push subscription, so the endpoint
-in my phpunit.travis.xml would ultimately expire
-(and require a human modification), and the corresponding tests would fail.
 But locally, these tests are handy.

tests/PushServiceTest.php

@@ -33,14 +33,14 @@ class PushServiceTest extends PHPUnit_Framework_TestCase
      * detect current OS, we can probably run this automatically
      * for Linux and OS X at a later date.
      */
-    protected function checkRequirements()
+    /** protected function checkRequirements()
     {
         parent::checkRequirements();
 
         if (!(getenv('TRAVIS') || getenv('CI'))) {
             $this->markTestSkipped('This test does not run on Travis.');
         }
-    }
+    }**/
 
     public static function setUpBeforeClass()
     {
@@ -77,9 +77,6 @@ public function browserProvider()
     {
         return array(
             // Web Push
-            array('chrome', 'stable', array()),
-            array('chrome', 'beta', array()),
-            array('chrome', 'unstable', array()),
             array('firefox', 'stable', array()),
             array('firefox', 'beta', array()),
             array('firefox', 'unstable', array()),

tests/WebPushTest.php

@@ -24,13 +24,41 @@ protected function checkRequirements()
     {
         parent::checkRequirements();
 
-        if (!array_key_exists('skipIfTravis', $this->getAnnotations()['method'])) {
-            return;
-        }
-
         if (getenv('TRAVIS') || getenv('CI')) {
             $this->markTestSkipped('This test does not run on Travis.');
         }
+
+        if (!getenv('STANDARD_ENDPOINT')) {
+          $this->markTestSkipped('No \'STANDARD_ENDPOINT\' found in env.');
+        }
+
+        if (!getenv('GCM_ENDPOINT')) {
+          $this->markTestSkipped('No \'GCM_ENDPOINT\' found in env.');
+        }
+
+        if (!getenv('USER_PUBLIC_KEY')) {
+          $this->markTestSkipped('No \'USER_PUBLIC_KEY\' found in env.');
+        }
+
+        if (!getenv('GCM_USER_PUBLIC_KEY')) {
+          $this->markTestSkipped('No \'GCM_USER_PUBLIC_KEY\' found in env.');
+        }
+
+        if (!getenv('USER_AUTH_TOKEN')) {
+          $this->markTestSkipped('No \'USER_PUBLIC_KEY\' found in env.');
+        }
+
+        if (!getenv('GCM_USER_AUTH_TOKEN')) {
+          $this->markTestSkipped('No \'GCM_USER_AUTH_TOKEN\' found in env.');
+        }
+
+        if (!getenv('VAPID_PUBLIC_KEY')) {
+          $this->markTestSkipped('No \'VAPID_PUBLIC_KEY\' found in env.');
+        }
+
+        if (!getenv('VAPID_PRIVATE_KEY')) {
+          $this->markTestSkipped('No \'VAPID_PRIVATE_KEY\' found in env.');
+        }
     }
 
     public static function setUpBeforeClass()
@@ -77,7 +105,6 @@ public function notificationProvider()
 
     /**
      * @dataProvider notificationProvider
-     * @skipIfTravis
      *
      * @param string $endpoint
      * @param string $payload
@@ -103,9 +130,6 @@ public function testSendNotificationWithTooBigPayload()
         );
     }
 
-    /**
-     * @skipIfTravis
-     */
     public function testFlush()
     {
         $this->webPush->sendNotification(self::$endpoints['standard']);
@@ -118,9 +142,6 @@ public function testFlush()
         $this->assertTrue($this->webPush->flush());
     }
 
-    /**
-     * @skipIfTravis
-     */
     public function testSendGCMNotificationWithoutGCMApiKey()
     {
         $webPush = new WebPush();
@@ -129,9 +150,6 @@ public function testSendGCMNotificationWithoutGCMApiKey()
         $webPush->sendNotification(self::$endpoints['GCM'], null, null, null, true);
     }
 
-    /**
-     * @skipIfTravis
-     */
     public function testSendGCMNotificationWithWrongGCMApiKey()
     {
         $webPush = new WebPush(array('GCM' => 'bar'));