Fixing issues with CI test fail

originphp · Jan 4, 2021 · 042435c · 042435c
1 parent a9f164b
commit 042435c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,6 +38,14 @@ jobs:
           composer update --no-progress --prefer-dist
       - name: Run PHPUnit
         run: "php vendor/bin/phpunit --coverage-clover=clover.xml"
+        env: 
+          EMAIL_ADDRESS: ${{ secrets.EMAIL_ADDRESS }}
+          EMAIL_HOST: ${{ secrets.EMAIL_HOST }}
+          EMAIL_USERNAME: ${{ secrets.EMAIL_USERNAME }}
+          EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
+          EMAIL_PORT: ${{ secrets.EMAIL_PORT }}
+          EMAIL_SSL: ${{ secrets.EMAIL_SSL }}
+          EMAIL_TLS: ${{ secrets.EMAIL_TLS }}
       - name: Coveralls
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,6 +13,7 @@
   <php>
     <const name="PHPUNIT" value="true"/>
     <env name="ORIGIN_ENV" value="test"/>
+    <!-- This is commented out if not CI fails
     <env name="EMAIL_ADDRESS" value="user@example.com"/>
     <env name="EMAIL_HOST" value="smtp.example.com"/>
     <env name="EMAIL_USERNAME" value="user@example.com"/>
@@ -22,5 +23,6 @@
     <env name="EMAIL_TLS" value="0"/>
     <env name="GSUITE_USERNAME" value="user@gmail.com"/>
     <env name="GSUITE_TOKEN" value="123g456789abcdef"/>
+    -->
   </php>
 </phpunit>
diff --git a/tests/EmailTest.php b/tests/EmailTest.php
@@ -761,7 +761,7 @@ public function testSmtpSend()
 
 
         $result = $email->send();
-        print_r($email->smtpLog());
+
         $this->assertNotEmpty($result);
         sleep(1); // small delay before next email is sent
         return implode("'\n", $email->smtpLog());

diff --git a/tests/Oauth2Test.php b/tests/Oauth2Test.php
@@ -24,7 +24,7 @@ class Oauth2Test extends \PHPUnit\Framework\TestCase
 {
     public function testGmail()
     {
-        if (! $this->env('GSUITE_TOKEN') or ! $this->env('GSUITE_USERNAME')) {
+        if (! $this->env('GSUITE_TOKEN') || ! $this->env('GSUITE_USERNAME')) {
             $this->markTestSkipped('No credentials');
         }
         Email::config('test-gmail', [