Merge pull request #6 from Deyjandi/develop

merge develop branch

Author: pavloskafritsas

.github/workflows/run-tests.yml

@@ -2,13 +2,14 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches: [main, develop, test]
   pull_request:
-    branches: [main]
+    branches: [main, develop, test]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    environment: testing
     strategy:
       fail-fast: true
       matrix:
@@ -45,3 +46,14 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/pest
+        env:
+          APP_KEY: ${{ secrets.APP_KEY }}
+          APP_ENV: ${{ secrets.APP_ENV }}
+          CACHE_DRIVER: ${{ secrets.CACHE_DRIVER }}
+          FILESYSTEM_DISK: ${{ secrets.FILESYSTEM_DISK }}
+          VIVA_WALLET_ENV: ${{ secrets.VIVA_WALLET_ENV }}
+          VIVA_WALLET_MERCHANT_ID: ${{ secrets.VIVA_WALLET_MERCHANT_ID }}
+          VIVA_WALLET_API_KEY: ${{ secrets.VIVA_WALLET_API_KEY }}
+          VIVA_WALLET_CLIENT_ID: ${{ secrets.VIVA_WALLET_CLIENT_ID }}
+          VIVA_WALLET_CLIENT_SECRET: ${{ secrets.VIVA_WALLET_CLIENT_SECRET }}
+          VIVA_WALLET_PAYMENT_SOURCE_CODE: ${{ secrets.VIVA_WALLET_PAYMENT_SOURCE_CODE }}

database/.gitkeep

@@ -83,7 +83,7 @@ public function getScope(): string
         return $this->scope;
     }
 
-    private function isExpired(): bool
+    public function isExpired(): bool
     {
         return now()->gte($this->issuedAt->addSeconds($this->getExpiresIn()));
     }

src/VivaWalletToken.php

@@ -9,6 +9,6 @@
     )->toBeString();
 });
 
-it('can generate webhook verification key', function () {
+it('can request webhook verification key', function () {
     expect(VivaWallet::requestWebhookKey())->toBeString();
 });

tests/VivaWalletTest.php

@@ -1,20 +1,26 @@
 <?php
 
-use Deyjandi\VivaWallet\Helpers\ClientAuth;
 use Deyjandi\VivaWallet\VivaWalletToken;
 use Illuminate\Support\Carbon;
 
-it(
-    'can make auth header',
-    fn () => expect(ClientAuth::token(VivaWalletToken::getInstance()))->toBeString()
-);
+it('can issue auth token', function () {
+    $token = VivaWalletToken::getInstance();
+
+    expect($token->getAccessToken())->toBeString();
+});
 
-it('can hit and expire from cache', function () {
+it('can hit cache', function () {
     $token = VivaWalletToken::getInstance();
 
     expect(cache('viva_wallet_token'))->toEqual($token);
+});
+
+it('can expire', function () {
+    $token = VivaWalletToken::getInstance();
 
     Carbon::setTestNow(now()->addSeconds($token->getExpiresIn()));
 
+    expect($token->isExpired())->toBeTrue();
+
     expect(cache('viva_wallet_token'))->toBeNull();
 });