Merge pull request #60 from wpengine/local-testing

Fix local testing and update tests

Author: raulcodes

Makefile

@@ -5,22 +5,28 @@ PLUGIN_NAME := wpengine-geoip
 
 # Shortcuts
 DOCKER_RUN := docker run --rm -v `pwd`:/workspace
-WP_TEST_IMAGE := worldpeaceio/wordpress-integration:5.2-php7.2
+WP_TEST_IMAGE := test-image
 COMPOSER_IMAGE := -v `pwd`:/app -v ~/.composer/cache:/tmp/cache:delegated composer
 DEPLOY_IMAGE := wp-deploy
 DEPLOY_ENV_VARS = -e SVN_USERNAME -e SVN_PASSWORD -e SLUG="$(PLUGIN_NAME)" -e VERSION="$(shell make get_version)" -e DEPLOY
 VENDOR_BIN_DIR := /workspace/vendor/bin
 BUILD_DIR := ./build
 
 # Commands
-all: composer_install lint test
+all: composer_install build-test lint test
 
 shell:
 	$(DOCKER_RUN) -it --entrypoint "/bin/bash" $(WP_TEST_IMAGE)
 
 composer_install:
 	$(DOCKER_RUN) $(COMPOSER_IMAGE) install
 
+build-test:
+	docker build \
+	--file ./test/Dockerfile.integration \
+	--tag $(WP_TEST_IMAGE) \
+	.
+
 lint:
 	$(DOCKER_RUN) --entrypoint "$(VENDOR_BIN_DIR)/phpcs" $(WP_TEST_IMAGE) src
 

composer.json

@@ -7,8 +7,14 @@
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.4",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^9.6.21",
         "wp-coding-standards/wpcs": "^2.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.5"
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+        "yoast/phpunit-polyfills": "^3.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }