Merge pull request #325 from Yoast/JRF/tests-improve-terminology-cons…

…istency Tests: consistency in terminology
Yoast · Oct 6, 2023 · 455a3dc · 455a3dc
2 parents 129479f + 31347ac
commit 455a3dc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -133,7 +133,7 @@ jobs:
           COVERALLS_FLAG_NAME: php-${{ matrix.php_version }}
         run: php-coveralls -v -x build/logs/clover.xml
 
-  integration-test:
+  wp-test:
     runs-on: ubuntu-latest
 
     strategy:
@@ -169,7 +169,7 @@ jobs:
             multisite: true
             coverage: true
 
-    name: "Integration Test: PHP ${{ matrix.php_version }} | WP ${{ matrix.wp_version }}${{ matrix.multisite == true && ' (+ ms)' || '' }}"
+    name: "WP Test: PHP ${{ matrix.php_version }} | WP ${{ matrix.wp_version }}${{ matrix.multisite == true && ' (+ ms)' || '' }}"
 
     # Allow builds to fail on as-of-yet unreleased WordPress versions.
     continue-on-error: ${{ matrix.wp_version == 'trunk' }}
@@ -208,23 +208,23 @@ jobs:
         shell: bash
         run: config/scripts/install-wp-tests.sh wordpress_test root '' 127.0.0.1:3306 ${{ matrix.wp_version }}
 
-      - name: Run integration tests - single site
+      - name: Run WP tests - single site
         if: ${{ matrix.coverage == false }}
-        run: composer integration-test
+        run: composer test-wp
 
-      - name: Run integration tests - multisite
+      - name: Run WP tests - multisite
         if: ${{ matrix.multisite == true && matrix.coverage == false }}
-        run: composer integration-test
+        run: composer test-wp
         env:
           WP_MULTISITE: 1
 
-      - name: Run integration tests with code coverage - single site
+      - name: Run WP tests with code coverage - single site
         if: ${{ matrix.coverage == true }}
-        run: composer integration-coverage
+        run: composer coverage-wp
 
-      - name: Run integration tests with code coverage - multisite
+      - name: Run WP tests with code coverage - multisite
         if: ${{ matrix.multisite == true && matrix.coverage == true }}
-        run: composer integration-coverage -- --coverage-clover build/logs/clover-integration-ms.xml
+        run: composer coverage-wp -- --coverage-clover build/logs/clover-wp-ms.xml
         env:
           WP_MULTISITE: 1
 
@@ -246,19 +246,19 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
           COVERALLS_PARALLEL: true
-          COVERALLS_FLAG_NAME: intgr-php-${{ matrix.php_version }}-wp-${{ matrix.wp_version }}
-        run: php-coveralls -v -x build/logs/clover-integration.xml
+          COVERALLS_FLAG_NAME: php-${{ matrix.php_version }}-wp-${{ matrix.wp_version }}
+        run: php-coveralls -v -x build/logs/clover-wp.xml
 
       - name: Upload coverage results to Coveralls - multisite
         if: ${{ success() && matrix.multisite == true && matrix.coverage == true }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
           COVERALLS_PARALLEL: true
-          COVERALLS_FLAG_NAME: intgr-php-${{ matrix.php_version }}-wp-${{ matrix.wp_version }}-ms
-        run: php-coveralls -v -x build/logs/clover-integration-ms.xml
+          COVERALLS_FLAG_NAME: php-${{ matrix.php_version }}-wp-${{ matrix.wp_version }}-ms
+        run: php-coveralls -v -x build/logs/clover-wp-ms.xml
 
   coveralls-finish:
-    needs: [unit-test, integration-test]
+    needs: [unit-test, wp-test]
     runs-on: ubuntu-latest
 
     steps:

diff --git a/composer.json b/composer.json
@@ -57,11 +57,17 @@
         "coverage": [
             "@php ./vendor/phpunit/phpunit/phpunit"
         ],
-        "integration-test": [
+        "test-wp": [
             "@php ./vendor/phpunit/phpunit/phpunit -c phpunit-wp.xml.dist --no-coverage"
         ],
-        "integration-coverage": [
+        "coverage-wp": [
             "@php ./vendor/phpunit/phpunit/phpunit -c phpunit-wp.xml.dist"
+        ],
+        "integration-test": [
+            "@test-wp"
+        ],
+        "integration-coverage": [
+            "@coverage-wp"
         ]
     },
     "config": {

diff --git a/phpunit-wp.xml.dist b/phpunit-wp.xml.dist
@@ -37,7 +37,7 @@
 
 	<logging>
 		<log type="coverage-text" target="php://stdout" showOnlySummary="true"/>
-		<log type="coverage-clover" target="build/logs/clover-integration.xml"/>
+		<log type="coverage-clover" target="build/logs/clover-wp.xml"/>
 	</logging>
 
 </phpunit>