diff --git a/.travis.yml b/.travis.yml index 1e235e49f..87462849e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,24 @@ before_install: - composer self-update --1 install: + - | + composer config repositories."1" "{ + \"type\": \"package\", + \"package\": { + \"name\": \"gravityforms/gravityforms\", + \"version\": \"2.4.21.3\", + \"type\": \"wordpress-plugin\", + \"dist\": { + \"type\": \"zip\", + \"url\": \"https://www.gravityhelp.com/wp-content/plugins/gravitymanager/api.php?op=get_plugin&slug=gravityforms&key=$GRAVITYFORMS_KEY\" + }, + \"require\": { + \"composer/installers\": \"^1.4\", + \"gotoandplay/gravityforms-composer-installer\": \"^2.3\" + } + } + }" + - composer require --dev gravityforms/gravityforms:2.4.21.3 - npm install script: diff --git a/composer.json b/composer.json index 8cd4a9adf..86c7261f6 100644 --- a/composer.json +++ b/composer.json @@ -8,22 +8,6 @@ { "type": "composer", "url":"https://wpackagist.org" - }, - { - "type": "package", - "package": { - "name": "gravityforms/gravityforms", - "version": "2.4.21.3", - "type": "wordpress-plugin", - "dist": { - "type": "zip", - "url": "https://www.gravityhelp.com/wp-content/plugins/gravitymanager/api.php?op=get_plugin&slug=gravityforms&key={%GRAVITYFORMS_KEY}" - }, - "require": { - "composer/installers": "^1.4", - "gotoandplay/gravityforms-composer-installer": "^2.3" - } - } } ], "require": { @@ -41,7 +25,6 @@ "wpackagist-plugin/advanced-custom-fields": "5.8.12", "wpackagist-plugin/easy-digital-downloads": "^2.9.23", "wpackagist-plugin/user-switching": "^1.5.5", - "gravityforms/gravityforms": "2.4.21.3", "wpsh/local": "^0.2.3" }, "config": { diff --git a/composer.lock b/composer.lock index 13c0c536d..683c0ba61 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6757958447b446aa2346fea9edc0d7c", + "content-hash": "f99215c75138a90c45a7b929cf25d346", "packages": [ { "name": "composer/installers", @@ -1053,7 +1053,7 @@ "version": "2.4.21.3", "dist": { "type": "zip", - "url": "https://www.gravityhelp.com/wp-content/plugins/gravitymanager/api.php?op=get_plugin&slug=gravityforms&key={%GRAVITYFORMS_KEY}" + "url": "https://www.gravityhelp.com/wp-content/plugins/gravitymanager/api.php?op=get_plugin&slug=gravityforms&key=77b1a7aadef0a06dac8c535d992a4e97" }, "require": { "composer/installers": "^1.4", @@ -1335,20 +1335,20 @@ }, { "name": "johnpbloch/wordpress", - "version": "5.6.1", + "version": "5.6.2", "source": { "type": "git", "url": "https://github.com/johnpbloch/wordpress.git", - "reference": "d7a597988102967cdfc28851b6b897d018613823" + "reference": "784b3440c9a11c3b65b988cc441db332ab0e6c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/d7a597988102967cdfc28851b6b897d018613823", - "reference": "d7a597988102967cdfc28851b6b897d018613823", + "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/784b3440c9a11c3b65b988cc441db332ab0e6c49", + "reference": "784b3440c9a11c3b65b988cc441db332ab0e6c49", "shasum": "" }, "require": { - "johnpbloch/wordpress-core": "5.6.1", + "johnpbloch/wordpress-core": "5.6.2", "johnpbloch/wordpress-core-installer": "^1.0 || ^2.0", "php": ">=5.6.20" }, @@ -1377,20 +1377,20 @@ "source": "http://core.trac.wordpress.org/browser", "wiki": "http://codex.wordpress.org/" }, - "time": "2021-02-03T21:27:41+00:00" + "time": "2021-02-22T15:30:37+00:00" }, { "name": "johnpbloch/wordpress-core", - "version": "5.6.1", + "version": "5.6.2", "source": { "type": "git", "url": "https://github.com/johnpbloch/wordpress-core.git", - "reference": "82592ec73d42cf784da38adb0028a24dbacab1b4" + "reference": "e48e723c0d7e38c5580631e6ffea29a4388c5dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/82592ec73d42cf784da38adb0028a24dbacab1b4", - "reference": "82592ec73d42cf784da38adb0028a24dbacab1b4", + "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/e48e723c0d7e38c5580631e6ffea29a4388c5dd0", + "reference": "e48e723c0d7e38c5580631e6ffea29a4388c5dd0", "shasum": "" }, "require": { @@ -1398,7 +1398,7 @@ "php": ">=5.6.20" }, "provide": { - "wordpress/core-implementation": "5.6.1" + "wordpress/core-implementation": "5.6.2" }, "type": "wordpress-core", "notification-url": "https://packagist.org/downloads/", @@ -1425,7 +1425,7 @@ "source": "https://core.trac.wordpress.org/browser", "wiki": "https://codex.wordpress.org/" }, - "time": "2021-02-03T21:27:35+00:00" + "time": "2021-02-22T15:30:31+00:00" }, { "name": "johnpbloch/wordpress-core-installer", @@ -7118,7 +7118,7 @@ }, { "name": "wp-phpunit/wp-phpunit", - "version": "5.6.1", + "version": "5.6.2", "source": { "type": "git", "url": "https://github.com/wp-phpunit/wp-phpunit.git", diff --git a/tests/tests/connectors/test-class-connector-gravityforms.php b/tests/tests/connectors/test-class-connector-gravityforms.php index 63a0da8d0..52dc1f837 100644 --- a/tests/tests/connectors/test-class-connector-gravityforms.php +++ b/tests/tests/connectors/test-class-connector-gravityforms.php @@ -26,6 +26,10 @@ public function setUp() { $this->mock->register(); + if ( ! $this->mock->is_dependency_satisfied() ) { + $this->markTestSkipped( 'A GravityForms is needed to run this test.' ); + } + // Load needed Gravity Forms files. require_once( \GFCommon::get_base_path() . '/form_settings.php' ); require_once( \GFCommon::get_base_path() . '/notification.php' );