Merge adbf2ea into 0ddf921

.gitignore

@@ -14,6 +14,7 @@ vendor/ivome/graphql-relay-php/*
 !vendor/autoload.php
 !vendor/composer
 vendor/composer/installed.json
+vendor/composer/*/
 !/tests
 build/
 coverage/*

.travis.yml

@@ -48,20 +48,18 @@ matrix:
 
 install:
   - cd $TRAVIS_BUILD_DIR
-  # Install composer packages, will also trigger dump-autoload
-  - composer install
   # Install WP CLI
   - curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
   - chmod +x wp-cli.phar
   - sudo mv wp-cli.phar /usr/local/bin/wp
 
 before_script:
   # Install WordPress and the Test Suite
-  - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+  - bash bin/install-wp-tests.sh wpgraphql_test root '' 127.0.0.1 $WP_VERSION
   # Update composer
   - composer self-update
   # Install APIGen and PHPUnit, using the specified version for the PHP version we're running
-  - composer require apigen/apigen:^4.1 phpunit/phpunit:$PHP_UNIT_VERSION
+  - composer require apigen/apigen:^4.1 lucatume/wp-browser:~1.21.20
   - composer install --no-interaction
   # Make a directory for storing logs
   - mkdir -p build/logs
@@ -72,9 +70,11 @@ script:
  - |
     if [ $COVERAGE == true ]; then
       vendor/bin/phpunit --group ajax
+      vendor/bin/codecept run wpunit
       vendor/bin/phpunit --coverage-clover build/logs/clover.xml
     else
       vendor/bin/phpunit --group ajax --no-coverage
+      vendor/bin/codecept run wpunit
       vendor/bin/phpunit --no-coverage
     fi
 

bin/install-wp-tests.sh

@@ -126,7 +126,7 @@ install_db() {
         mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
     fi
 
-     RESULT_2=`mysql -u $DB_USER --password="$DB_PASS" --skip-column-names -e "SHOW DATABASES LIKE '$DB_SERVE_NAME'"`
+    RESULT_2=`mysql -u $DB_USER --password="$DB_PASS" --skip-column-names -e "SHOW DATABASES LIKE '$DB_SERVE_NAME'"`
     if [ "$RESULT_2" != $DB_SERVE_NAME ]; then
         mysqladmin create $DB_SERVE_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
     fi
@@ -139,7 +139,6 @@ configure_wordpress() {
     wp config create --dbname="$DB_SERVE_NAME" --dbuser=root --dbpass="$DB_PASS" --dbhost="$DB_HOST" --skip-check --force=true
     wp core install --url=wpgraphql.test --title="WPGraphQL Tests" --admin_user=admin --admin_password=password --admin_email=admin@wpgraphql.test
     wp rewrite structure '/%year%/%monthnum%/%postname%/'
-
 }
 
 activate_plugin() {
@@ -152,11 +151,11 @@ activate_plugin() {
     # activate the plugin
     wp plugin activate wp-graphql
 
-    # List active plugins
-    wp plugin list
-
     # Flush the permalinks
     wp rewrite flush
+
+    # Export the db for codeception to use
+    wp db export $PLUGIN_DIR/tests/_data/dump.sql
 }
 
 install_wp

codeception.yml

@@ -0,0 +1,20 @@
+paths:
+    tests: tests
+    output: tests/_output
+    data: tests/_data
+    support: tests/_support
+    envs: tests/_envs
+actor_suffix: Tester
+extensions:
+    enabled:
+        - Codeception\Extension\RunFailed
+    commands:
+        - Codeception\Command\GenerateWPUnit
+        - Codeception\Command\GenerateWPRestApi
+        - Codeception\Command\GenerateWPRestController
+        - Codeception\Command\GenerateWPRestPostTypeController
+        - Codeception\Command\GenerateWPAjax
+        - Codeception\Command\GenerateWPCanonical
+        - Codeception\Command\GenerateWPXMLRPC
+        - Codeception\Command\DbSnapshot
+        - tad\Codeception\Command\SearchReplace

composer.json

@@ -23,10 +23,6 @@
     "webonyx/graphql-php": "^0.11.2",
     "ivome/graphql-relay-php": "^0.3.1"
   },
-  "require-dev": {
-    "phpunit/phpunit": "5.6",
-    "satooshi/php-coveralls": "~1.0"
-  },
   "config": {
     "optimize-autoloader": true
   },

tests/_data/config.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Disable autoloading while running tests, as the test
+ * suite already bootstraps the autoloader and creates
+ * fatal errors when the autoloader is loaded twice
+ */
+define( 'WPGRAPHQL_AUTOLOAD', false );

tests/_output/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/_support/AcceptanceTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class AcceptanceTester extends \Codeception\Actor
+{
+    use _generated\AcceptanceTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}

tests/_support/FunctionalTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class FunctionalTester extends \Codeception\Actor
+{
+    use _generated\FunctionalTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}

tests/_support/Helper/Acceptance.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Acceptance extends \Codeception\Module
+{
+
+}

tests/_support/Helper/Functional.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Functional extends \Codeception\Module
+{
+
+}

tests/_support/Helper/Unit.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Unit extends \Codeception\Module
+{
+
+}

tests/_support/Helper/Wpunit.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Wpunit extends \Codeception\Module
+{
+
+}

tests/_support/UnitTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class UnitTester extends \Codeception\Actor
+{
+    use _generated\UnitTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}

tests/_support/WpunitTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class WpunitTester extends \Codeception\Actor
+{
+    use _generated\WpunitTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}

tests/_support/_generated/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/acceptance.suite.yml

@@ -0,0 +1,29 @@
+# Codeception Test Suite Configuration
+#
+# Suite for acceptance tests.
+# Perform tests in browser using the WPWebDriver or WPBrowser.
+# Use WPDb to set up your initial database fixture.
+# If you need both WPWebDriver and WPBrowser tests - create a separate suite.
+
+actor: AcceptanceTester
+modules:
+    enabled:
+        - WPDb
+        - WPBrowser
+        - \Helper\Acceptance
+    config:
+        WPDb:
+            dsn: 'mysql:host=127.0.0.1;dbname=wpgraphql_serve'
+            user: 'root'
+            password: 'jbutt#123'
+            dump: 'tests/_data/dump.sql'
+            populate: true #import the dump before the tests
+            cleanup: true #import the dump between tests
+            url: 'http://wp.localhost'
+            urlReplacement: true #replace the hardcoded dump URL with the one above
+            tablePrefix: 'wp_'
+        WPBrowser:
+            url: 'http://wp.localhost'
+            adminUsername: 'admin'
+            adminPassword: 'password'
+            adminPath: '/wp-admin'

tests/functional.suite.yml

@@ -0,0 +1,29 @@
+# Codeception Test Suite Configuration
+#
+# Suite for functional tests
+# Emulate web requests and make WordPress process them
+
+actor: FunctionalTester
+modules:
+    enabled:
+        - WPDb
+        - WordPress
+        - Asserts
+        - \Helper\Functional
+    config:
+        WPDb:
+            dsn: 'mysql:host=127.0.0.1;dbname=wpgraphql_serve'
+            user: 'root'
+            password: 'jbutt#123'
+            dump: 'tests/_data/dump.sql'
+            populate: true
+            cleanup: true
+            url: 'http://wp.localhost'
+            urlReplacement: true
+            tablePrefix: 'wp_'
+        WordPress:
+            depends: WPDb
+            wpRootFolder: '/tmp/wordpress'
+            adminUsername: 'admin'
+            adminPassword: 'password'
+            adminPath: '/wp-admin'