Merge branch 'main' of github.com:vlad-ko/laravel-stripe-app-gh

vlad-ko · Jun 7, 2024 · 2c02d64 · 2c02d64
2 parents 37f3534 + 52f31a2
commit 2c02d64
Show file tree

Hide file tree

Showing 8 changed files with 5,579 additions and 18,166 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -53,10 +53,10 @@ jobs:
           php artisan db:seed
 
       - name: Install NPM modules
-        run: npm i
+        run: npm i --legacy-peer-deps
 
-      ### START Codecov integration ###
-      - name: Download Codecov binary # step 1
+      ### START Codecov integration ### (Codecov integration - STEP 1)
+      - name: Download Codecov binary 
         run: curl -Os https://uploader.codecov.io/latest/linux/codecov
 
       ### STEPS below are not required, but are great to have for extra security
@@ -69,22 +69,22 @@ jobs:
           curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig   
 
 
-      ## VEIFY integrity 
+      ## VEIFY integrity (Codecov integration - STEP 2)
       - name: Test Signature
         run: gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
 
       - name: Test SHAsums
         run: shasum -a 256 -c codecov.SHA256SUM
 
-      - name: Fix permission #step 2
+      - name: Fix permission 
         run: chmod +x codecov
 
 
-       # RUN tests an upload reports ## comment
+       # RUN tests an upload reports ## comment (Codecov integration - STEP 3)
       - name: Run Service Testsuite with Coverage
         run: vendor/bin/phpunit --testsuite="Services Tests" --coverage-clover=coverage-service.xml
 
-      - name: Upload Service coverage report #step 3
+      - name: Upload Service coverage report 
         run: ./codecov upload-process --disable-search -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml
 
       - name: Run Controller Testsuite with Coverage
@@ -109,4 +109,4 @@ jobs:
         run: ./codecov upload-process  -t ${{ secrets.CODECOV_TOKEN }} -n 'javascript'-${{ github.run_id }} -F 'javascript' -f coverage/coverage-final.json
 
       - name: Trigger notifications
-        run: ./codecov send-notifications -t ${{ secrets.CODECOV_TOKEN }} 
+        run: ./codecov send-notifications -t ${{ secrets.CODECOV_TOKEN }} 
diff --git a/.github/workflows/pr-only.yaml b/.github/workflows/pr-only.yaml
@@ -47,13 +47,15 @@ jobs:
           php artisan db:seed
 
       - name: Install NPM modules
-        run: npm i
+        run: npm i 
 
-      ### START Codecov integration ###
-      - name: Download Codecov CLI Binary # step 1
-        run: curl -Os https://cli.codecov.io/latest/linux/codecov
+      - name: Install jest
+        run: npm i -g jest
 
-
+      ### START Codecov integration ### (Codecov integration - STEP 1)
+      - name: Download Codecov CLI Binary 
+        run: curl -Os https://cli.codecov.io/latest/linux/codecov
+
       ### STEPS below are not required, but are great to have for extra security
       - name: Verify integrity get GPG
         run: curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
@@ -63,21 +65,21 @@ jobs:
           curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM
           curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM.sig
   
-      ## VERIFY integrity 
+      ## VERIFY integrity ### (Codecov integration - STEP 2)
       - name: Test Signature
         run: gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
 
       - name: Test SHAsums
         run: shasum -a 256 -c codecov.SHA256SUM
 
-      - name: Fix permission #step 2
+      - name: Fix permission 
         run: sudo chmod +x codecov
 
-      # RUN tests an upload reports ## comment
+      # RUN tests an upload reports ### (Codecov integration - STEP 3)
       - name: Run Service Testsuite with Coverage
         run: vendor/bin/phpunit --testsuite="Services Tests" --coverage-clover=coverage-service.xml
 
-      - name: Upload Service coverage report #step 3
+      - name: Upload Service coverage report 
         run: ./codecov upload-process --disable-search -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml
 
       - name: Run Controller Testsuite with Coverage

diff --git a/app/Models/Charge.php b/app/Models/Charge.php
@@ -73,7 +73,7 @@ public function uncoveredFunction() {
         return 80;
     }
 
-    public function uncoveredDDfunction() {
-        return 'new';
+    public function returnSeventySix() {
+        return 76;
     }
  }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
     laravel.test:
         build: