Release v0.2.1

.coveralls.yml

@@ -1,2 +1,3 @@
 service_name: travis-ci
-coverage_clover: tests/_output/coverage.xml
+coverage_clover: tests/_output/coverage.xml
+json_path: tests/_output/coverage.json

.dockerignore

@@ -0,0 +1,3 @@
+.env
+.github_changelog_generator
+.travis.yml

.env.dist

@@ -1,19 +1,27 @@
-TEST_DB_NAME="wpgraphql_woocommerce_test"
-TEST_DB_HOST="127.0.0.1"
-TEST_DB_USER="root"
-TEST_DB_PASSWORD=""
-WP_VERSION=latest
+DB_NAME=wordpress
+DB_HOST=app_db
+DB_USER=wordpress
+DB_PASSWORD=wordpress
+WP_TABLE_PREFIX=wp_
+WP_URL=http://localhost
+WP_DOMAIN=localhost
+[email protected]
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=password
+ADMIN_PATH=/wp-admin
+
+TEST_DB_NAME=woographql_tests
+TEST_DB_HOST=127.0.0.1
+TEST_DB_USER=wordpress
+TEST_DB_PASSWORD=wordpress
+TEST_WP_TABLE_PREFIX=wp_
+
 SKIP_DB_CREATE=false
-WP_ROOT_FOLDER="/tmp/wordpress"
-TEST_SITE_WP_ADMIN_PATH="/wp-admin"
-TEST_SITE_DB_NAME="wpgraphql_woocommerce_test"
-TEST_SITE_DB_HOST="127.0.0.1"
-TEST_SITE_DB_USER="root"
-TEST_SITE_DB_PASSWORD=""
-TEST_SITE_TABLE_PREFIX="wp_"
-TEST_TABLE_PREFIX="wp_"
-TEST_SITE_WP_URL="http://wp.test"
-TEST_SITE_WP_DOMAIN="wp.test"
-TEST_SITE_ADMIN_EMAIL="[email protected]"
-TEST_SITE_ADMIN_USERNAME="admin"
-TEST_SITE_ADMIN_PASSWORD="password"
+TEST_WP_ROOT_FOLDER=/tmp/wordpress
+[email protected]
+
+TESTS_DIR=tests
+TESTS_OUTPUT=tests/_output
+TESTS_DATA=tests/_data
+TESTS_SUPPORT=tests/_support
+TESTS_ENVS=tests/_envs

.gitignore

@@ -8,6 +8,8 @@ node_modules/
 *.tar.gz
 *.zip
 .env
+.env.*
+!.env.dist
 .idea
 .vscode
 .github_changelog_generator
@@ -17,11 +19,15 @@ vendor/*
 !vendor/composer
 vendor/composer/installed.json
 vendor/composer/*/
-!/tests
-/tests/*.suite.yml
+!tests
+tests/*.suite.yml
 build/
 coverage/*
 schema.graphql
 phpunit.xml
 docker-output
 composer.lock
+c3.php
+.log/
+php-coveralls.phar
+codeception.yml

.travis.yml

@@ -3,6 +3,9 @@ dist: trusty
 
 language: php
 
+services:
+  - docker
+
 notifications:
   email:
     on_success: never
@@ -11,39 +14,52 @@ notifications:
 branches:
   only:
     - develop
-    - release-v0.1.1
+    - master
     - release-v0.1.2
     - release-v0.2.0
+    - release-v0.2.1
 
 cache:
   apt: true
   directories:
     - vendor
     - $HOME/.composer/cache
 
-# Set the global environment variables
-env:
-  global:
-    - WP_CORE_DIR: /tmp/wordpress
-    - COVERAGE: false
-    - DEBUG: false
-
 matrix:
   include:
+    - php: 7.3
+      env: PHP_VERSION=7.3 WP_VERSION=5.2 COVERAGE=1
+    - php: 7.3
+      env: PHP_VERSION=7.3 PHPCS=1
     - php: 7.2
-      env: WP_VERSION=latest COVERAGE=1
+      env: PHP_VERSION=7.2 WP_VERSION=5.2
     - php: 7.2
-      env: PHPCS=1
+      env: PHP_VERSION=7.2 WP_VERSION=4.9
+    - php: 7.1
+      env: PHP_VERSION=7.1 WP_VERSION=5.2
     - php: 7.1
-      env: WP_VERSION=latest
+      env: PHP_VERSION=7.1 WP_VERSION=4.9
     - php: 7.0
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_VERSION=4.5
+      env: PHP_VERSION=7.0 WP_VERSION=5.0
+    - php: 7.0
+      env: PHP_VERSION=7.0 WP_VERSION=4.9
     - php: 5.6
-      env: WP_VERSION=latest DEBUG=1
+      env: PHP_VERSION=5.6 WP_VERSION=5.0 DEBUG=1
     - php: 5.6
-      env: WP_VERSION=trunk
+      env: PHP_VERSION=5.6 WP_VERSION=4.9 DEBUG=1
+
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+  - |
+    # Remove Xdebug for a huge performance increase:
+    if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
+      phpenv config-rm xdebug.ini
+    else
+      echo "xdebug.ini does not exist"
+    fi
 
 install:
   - |
@@ -55,45 +71,48 @@ install:
 before_script:
   - |
     if [ ! -z "$WP_VERSION" ]; then
-      # Install and config Codeception
-      cp .env.dist .env
-      composer install-wp-tests
-      COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-source --no-interaction
-      if [ "$COVERAGE" == "1" ]; then
-        # Install Coveralls
-        mkdir -p build/logs
-        COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require php-coveralls/php-coveralls
-      fi
-      ls -al
+      # Build images.
+      docker-compose build \
+        --build-arg DESIRED_PHP_VERSION=${PHP_VERSION} \
+        --build-arg DESIRED_WP_VERSION=${WP_VERSION} \
+        testing
     fi   
   # Install PHP CodeSniffer and WPCS.
   - |
     if [ "$PHPCS" == "1" ]; then
-      COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require squizlabs/php_codesniffer phpcompatibility/phpcompatibility-wp wp-coding-standards/wpcs dealerdirect/phpcodesniffer-composer-installer
+      COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require \
+        squizlabs/php_codesniffer \
+        phpcompatibility/phpcompatibility-wp wp-coding-standards/wpcs \
+        dealerdirect/phpcodesniffer-composer-installer
       COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-dev
-      ls -al
     fi
 
 script:
   # Execute unit tests with coverage if specified, otherwise without coverage
   - |
     if [ ! -z "$WP_VERSION" ]; then
-      if [ "$COVERAGE" == "1" ]; then
-        vendor/bin/codecept run wpunit --coverage --coverage-xml
-      elif [ "$DEBUG" == "1" ]; then
-        vendor/bin/codecept run wpunit --debug
-      else
-        vendor/bin/codecept run wpunit
-      fi
+      docker-compose run --rm \
+        -e SUITES='acceptance;functional;wpunit' \
+        -e COVERAGE=${COVERAGE:-0} \
+        -e DEBUG=${DEBUG:-0} \
+        testing --scale app=0
     fi
   - |
     if [ "$PHPCS" == "1" ]; then
-      vendor/bin/phpcs wp-graphql-woocommerce.php access-functions.php class-inflect.php includes/*.php --standard=WordPress
+      vendor/bin/phpcs \
+        wp-graphql-woocommerce.php \
+        access-functions.php \
+        class-inflect.php \
+        includes/*.php --standard=WordPress
     fi
 after_success:
-  # Runs Coveralls.io client
+  # Download and run Coveralls.io client
   - |
     if [ "$COVERAGE" == "1" ]; then
-      travis_retry php vendor/bin/php-coveralls -v
+      wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
+      chmod +x php-coveralls.phar
+
+      sed -i 's/\/var\/www\/html\/wp-content\/plugins\/wp-graphql-woocommerce\///g' tests/_output/coverage.xml
+      travis_retry php php-coveralls.phar -v
     fi
 

CHANGELOG.md

@@ -1,16 +1,34 @@
 # Change Log
 
-## [v0.2.0-beta](https://github.com/wp-graphql/wp-graphql-woocommerce/tree/v0.2.0-beta) (2019-07-11)
-[Full Changelog](https://github.com/wp-graphql/wp-graphql-woocommerce/compare/v0.1.2-beta...v0.2.0-beta)
+## [v0.2.1-beta](https://github.com/wp-graphql/wp-graphql-woocommerce/tree/v0.2.1-beta) (2019-08-27)
+[Full Changelog](https://github.com/wp-graphql/wp-graphql-woocommerce/compare/v0.2.0-beta...v0.2.1-beta)
 
 **Implemented enhancements:**
 
-- Release v0.2.0 code cleanup [\#107](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/107) ([kidunot89](https://github.com/kidunot89))
-- updateItemQuantities mutation [\#106](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/106) ([kidunot89](https://github.com/kidunot89))
-- deleteOrderItems mutation [\#104](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/104) ([kidunot89](https://github.com/kidunot89))
-- Adds NO\_QL\_SESSION\_HANDLER flag [\#103](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/103) ([kidunot89](https://github.com/kidunot89))
-- Adds product category image to schema. [\#102](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/102) ([kidunot89](https://github.com/kidunot89))
-- Query products by slug and sku [\#101](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/101) ([kidunot89](https://github.com/kidunot89))
+- Hooks for mutations [\#108](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/108)
+- productBy query should support querying by slug [\#95](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/95)
+- Support update of multiple quantities in cart in a single mutation [\#94](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/94)
+- Other mutations [\#19](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/19)
+- Order mutations [\#16](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/16)
+- Checkout mutation bugfix/enhancements [\#132](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/132) ([kidunot89](https://github.com/kidunot89))
+- Adds "taxonomyFilter" to product connections [\#126](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/126) ([kidunot89](https://github.com/kidunot89))
+- MetaData type and queries [\#123](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/123) ([kidunot89](https://github.com/kidunot89))
+- PaymentGateway type. [\#118](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/118) ([kidunot89](https://github.com/kidunot89))
+- CI upgrade [\#115](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/115) ([kidunot89](https://github.com/kidunot89))
+
+**Fixed bugs:**
+
+- customerRegister mutation resolves wrong object for `viewer` field [\#111](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/111)
+- I cant see the category thumbnail  [\#93](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/93)
+
+**Merged pull requests:**
+
+- Add contributor [\#131](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/131) ([ranaaterning](https://github.com/ranaaterning))
+- Bug related to resolving product connections by taxonomies fixed. [\#125](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/125) ([kidunot89](https://github.com/kidunot89))
+- PostObject hierarchy bugfix [\#124](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/124) ([kidunot89](https://github.com/kidunot89))
+
+## [v0.2.0-beta](https://github.com/wp-graphql/wp-graphql-woocommerce/tree/v0.2.0-beta) (2019-07-11)
+[Full Changelog](https://github.com/wp-graphql/wp-graphql-woocommerce/compare/v0.1.2-beta...v0.2.0-beta)
 
 **Fixed bugs:**
 
@@ -20,13 +38,6 @@
 
 - Customer id doesn't match user id [\#90](https://github.com/wp-graphql/wp-graphql-woocommerce/issues/90)
 
-**Merged pull requests:**
-
-- checkout mutation [\#100](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/100) ([kidunot89](https://github.com/kidunot89))
-- deleteOrder mutation [\#99](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/99) ([kidunot89](https://github.com/kidunot89))
-- updateOrder mutation [\#98](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/98) ([kidunot89](https://github.com/kidunot89))
-- createOrder mutation [\#97](https://github.com/wp-graphql/wp-graphql-woocommerce/pull/97) ([kidunot89](https://github.com/kidunot89))
-
 ## [v0.1.2-beta](https://github.com/wp-graphql/wp-graphql-woocommerce/tree/v0.1.2-beta) (2019-06-23)
 [Full Changelog](https://github.com/wp-graphql/wp-graphql-woocommerce/compare/v0.1.1-beta...v0.1.2-beta)
 

Dockerfile

@@ -0,0 +1,49 @@
+############################################################################
+# Container for running Codeception tests on a WooGraphQL Docker instance. #
+############################################################################
+
+# Using the 'DESIRED_' prefix to avoid confusion with environment variables of the same name.
+ARG DESIRED_WP_VERSION
+ARG DESIRED_PHP_VERSION
+
+FROM kidunot89/woographql-app:wp${DESIRED_WP_VERSION}-php${DESIRED_PHP_VERSION}
+
+
+LABEL author=kidunot89
+LABEL author_uri=https://github.com/kidunot89
+
+SHELL [ "/bin/bash", "-c" ]
+
+ARG DESIRED_WP_VERSION
+ARG DESIRED_PHP_VERSION
+
+# Install php extensions
+RUN docker-php-ext-install pdo_mysql
+
+# Install Xdebug
+RUN if [ "$DESIRED_PHP_VERSION" == "5.6" ]; then yes | pecl install xdebug-2.5.5; else yes | pecl install xdebug;  fi \
+    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
+
+# Install composer
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+RUN curl -sS https://getcomposer.org/installer | php -- \
+    --filename=composer \
+    --install-dir=/usr/local/bin
+
+# Add composer global binaries to PATH
+ENV PATH "$PATH:~/.composer/vendor/bin"
+
+# Configure php
+RUN echo "date.timezone = UTC" >> /usr/local/etc/php/php.ini
+
+# Remove exec statement from base entrypoint script.
+RUN sed -i '$d' /usr/local/bin/app-entrypoint.sh
+
+# Set up entrypoint
+WORKDIR    /var/www/html/wp-content/plugins/wp-graphql-woocommerce
+COPY       bin/testing-entrypoint.sh /usr/local/bin/testing-entrypoint.sh
+RUN        chmod 755 /usr/local/bin/testing-entrypoint.sh
+ENTRYPOINT ["testing-entrypoint.sh"]