Action codecov

.codecov.yml

@@ -0,0 +1,21 @@
+codecov:
+  require_ci_to_pass: yes
+
+github_checks:
+  annotations: yes
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,tree"
+  behavior: default
+  require_changes: no
+  show_carryforward_flags: no
+
+fixes:
+  - "drupal/modules/contrib/apigee_api_catalog::/"

.github/workflows/php.yml

@@ -12,7 +12,7 @@ env:
   BROWSERTEST_OUTPUT_DIRECTORY: "sites/simpletest/browser_output"
   BROWSERTEST_OUTPUT_BASE_URL: ""
   MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", { "chromeOptions": { "w3c": false } }, "http://127.0.0.1:9515/wd/hub"]'
-  
+
 on:
   push:
   pull_request_target:
@@ -44,11 +44,11 @@ jobs:
       run: |
         echo "Disable deprecations check"
         echo "SYMFONY_DEPRECATIONS_HELPER=disabled" >> $GITHUB_ENV
-
+        
     - name: "Install PHP"
       uses: "shivammathur/setup-php@v2"
       with:
-        coverage: "none"
+        coverage: "xdebug"
         php-version: "${{ matrix.php-version }}"
         tools: composer:v2
         extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv, opcache, imagick
@@ -83,57 +83,59 @@ jobs:
         composer config --json extra.patches."drupal/core" '{ "Support entities that are neither content nor config entities": "https://www.drupal.org/files/issues/2020-12-02/3042467-50.patch"}'
         composer update --with-all-dependencies
         composer require --dev phpspec/prophecy-phpunit:^2
-
+        
     # Install drupal using minimal installation profile and enable the module.
     - name: Install Drupal
       run: |
         cd drupal   
         php -d sendmail_path=$(which true); vendor/bin/drush --yes -v site-install minimal --db-url="$SIMPLETEST_DB"
         vendor/bin/drush rs 8000 &
-
+        
     - name: "PHPCS"
       run: |
         cd drupal
         cp modules/contrib/apigee_api_catalog/phpcs.xml.dist .
         vendor/bin/phpcs --standard=./phpcs.xml.dist modules/contrib/apigee_api_catalog -p -s -n --colors
         composer show > composer.show.txt
-
+        
     - name: Artifacts
       uses: actions/upload-artifact@v3
       with:
         name: composer-${{ matrix.php-version }}-${{ matrix.drupal-core }}-artifact
         path: drupal/composer.*
 
-    - name: "PHPUnit unit"
-      run: |
-        cd drupal
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite unit
-
-    - name: "PHPUnit kernel"
-      run: |
-        cd drupal
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite kernel
-
     - uses: nanasess/setup-chromedriver@v1
 
     - run: |
         export DISPLAY=:99
         chromedriver --url-base=/wd/hub &
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
-
-    - name: "PHPUnit functional javascript"
+
+    - name: "Run PHPUnit"
+      if: ${{ matrix.drupal-core != '9.4.x' || matrix.php-version != '8.1' }}
       run: |
         cd drupal
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite functional-javascript
-
-    - name: "PHPUnit functional"
+        vendor/bin/phpunit -c core --verbose --debug --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_api_catalog
+
+    - name: "PHPUnit Test with Code Coverage"
+      if: ${{ matrix.drupal-core == '9.4.x' && matrix.php-version == '8.1' }}
       run: |
         cd drupal
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite functional
+        cp modules/contrib/apigee_api_catalog/phpunit.core.xml.dist core/phpunit.xml
+        vendor/bin/phpunit -c core --verbose --debug --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript --coverage-clover /tmp/coverage.xml modules/contrib/apigee_api_catalog
 
     - name: Artifacts
       if: failure()
       uses: actions/upload-artifact@v3
       with:
         name: browser-output-${{ matrix.php-version }}-${{ matrix.drupal-core }}-artifact
         path: drupal/sites/simpletest/browser_output/*
+
+    - name: Upload coverage to Codecov
+      if: ${{ matrix.drupal-core == '9.4.x' && matrix.php-version == '8.1' }}
+      uses: codecov/codecov-action@v3
+      with:
+        files: /tmp/coverage.xml
+        name: codecov-umbrella
+        fail_ci_if_error: true
+        verbose: true

phpunit.core.xml.dist

@@ -66,23 +66,18 @@
   </listeners>
   <!-- Filter for coverage reports. -->
   <filter>
-    <whitelist>
-      <directory>./includes</directory>
-      <directory>./lib</directory>
-      <!-- Extensions can have their own test directories, so exclude those. -->
-      <directory>./modules</directory>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory>../modules/contrib/apigee_api_catalog</directory>
+      <!-- By definition test classes have no tests. -->
       <exclude>
-        <directory>./modules/*/src/Tests</directory>
-        <directory>./modules/*/tests</directory>
+        <directory>../modules/contrib/apigee_api_catalog/tests</directory>
+        <directory>../modules/contrib/apigee_api_catalog/test_modules</directory>
       </exclude>
-      <directory>../modules</directory>
-      <exclude>
-        <directory>../modules/*/src/Tests</directory>
-        <directory>../modules/*/tests</directory>
-        <directory>../modules/*/*/src/Tests</directory>
-        <directory>../modules/*/*/tests</directory>
-      </exclude>
-      <directory>../sites</directory>
-     </whitelist>
+    </whitelist>
   </filter>
+   <!-- Define the results that we need. -->
+  <logging>
+	<log type="coverage-clover" target="../../reports/phpunit/tests-clover.xml"/>
+	<log type="junit" target="../../reports/phpunit/tests-junit.xml" logIncompleteSkipped="false"/>
+  </logging>
 </phpunit>