Merge pull request #35 from wp-media/revert-32-tests/fixed-tests

Revert "Tests/fixed tests"
wp-media · Jul 18, 2024 · 547c2a5 · 547c2a5
2 parents 8df73d7 + 91a40fa
commit 547c2a5
Show file tree

Hide file tree

Showing 112 changed files with 611 additions and 9,377 deletions.
diff --git a/.distignore b/.distignore
@@ -2,8 +2,6 @@
 /.git
 /.github
 /.wordpress-org
-/bin
-/tests
 
 .distignore
 .gitignore

diff --git a/.github/workflows/lint_phpcs.yml b/.github/workflows/lint_phpcs.yml
diff --git a/.github/workflows/test_php8.yml b/.github/workflows/test_php8.yml
diff --git a/.github/workflows/test_rocketcdn.yml b/.github/workflows/test_rocketcdn.yml
diff --git a/bin/browserstack.png b/bin/browserstack.png
diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh
diff --git a/bin/makemo.sh b/bin/makemo.sh
diff --git a/bin/phpcs-changed.sh b/bin/phpcs-changed.sh
diff --git a/composer.json b/composer.json
@@ -34,13 +34,13 @@
         "league/container": "^3.3",
         "phpcompatibility/phpcompatibility-wp": "^2.0",
         "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit": "^7.5 || ^8 || ^9",
+        "phpunit/phpunit": "^7.5",
         "phpunit/php-file-iterator": "2.0.3",
         "psr/container": "1.0.0",
         "roave/security-advisories": "dev-master",
         "szepeviktor/phpstan-wordpress": "^0.7.0",
         "wp-coding-standards/wpcs": "^2",
-        "wp-media/phpunit": "^3.0"
+        "wp-media/phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -65,10 +65,12 @@
     },
     "scripts": {
         "test-unit": "\"vendor/bin/phpunit\" --testsuite unit --colors=always --configuration tests/Unit/phpunit.xml.dist",
-        "test-integration": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist",
+        "test-integration": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist --exclude-group AdminOnly",
+        "test-integration-adminonly": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist --group AdminOnly",
         "run-tests": [
             "@test-unit",
-            "@test-integration"
+            "@test-integration",
+            "@test-integration-adminonly"
         ],
         "run-stan":"vendor/bin/phpstan analyze --memory-limit=2G --no-progress",
         "phpcs": "phpcs --basepath=.",