Merge pull request #289 from lucatume/release/2.2.19

release 2.2.19

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,7 +20,7 @@ WordPress structure and management: [e.g. default, Bedrock, other]
 If applicable, try to walk through the test and execute it manually: can you do it using the browser?
 
 **Codeception configuration file**  
-Paste, in a fenced YAML block, the content of your Codeception configuration file; remove any sensible data!  
+Paste, in a fenced YAML block, the content of your Codeception configuration file; remove any sensitive data!  
 
 ```yaml
 actor: Tester
@@ -39,7 +39,7 @@ params:
 
 
 **Suite configuration file**
-Paste, in a fenced YAML block, the content of the suite configuration file; remove any sensible data!
+Paste, in a fenced YAML block, the content of the suite configuration file; remove any sensitive data!
 
 ```yaml
 # Codeception Test Suite Configuration

.github/ISSUE_TEMPLATE/setup-issue.md

@@ -23,7 +23,7 @@ The bootstrap command is the recommended way to scaffold tests.
 Codeception documentation can be found [here](https://codeception.com/docs/01-Introduction), wp-browser documentation can be found [here](https://wpbrowser.wptestkit.dev/).
 
 **Codeception configuration file**
-If you were able to complete the setup then paste, in a fenced YAML block, the content of your Codeception configuration file; remove any sensible data!
+If you were able to complete the setup then paste, in a fenced YAML block, the content of your Codeception configuration file; remove any sensitive data!
 
 ```yaml
 actor: Tester

CHANGELOG.md

@@ -3,8 +3,11 @@ All notable changes after version 1.6.16 to this project will be documented in t
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased] Unreleased
+
+## [2.2.189] 2019-08-16;
 ### Fixed
 - enhancements to the build scripts (thanks @karser)
+- avoid redefining constants during `WPLoader` module bootstrap
 
 ## [2.2.18] 2019-08-02;
 ### Fixed
@@ -1087,4 +1090,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 [2.2.16]: https://github.com/lucatume/wp-browser/compare/2.2.15...2.2.16
 [2.2.17]: https://github.com/lucatume/wp-browser/compare/2.2.16...2.2.17
 [2.2.18]: https://github.com/lucatume/wp-browser/compare/2.2.17...2.2.18
-[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.18...HEAD
+[2.2.19]: https://github.com/lucatume/wp-browser/compare/2.2.18...2.2.19
+[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.19...HEAD

src/includes/bootstrap.php

@@ -14,14 +14,19 @@
 global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
 
 define('DIR_TESTDATA', __DIR__ . '/../data');
-define('WP_LANG_DIR', DIR_TESTDATA . '/languages');
+
+if(!defined('WP_LANG_DIR')){
+		define('WP_LANG_DIR', DIR_TESTDATA . '/languages');
+}
 
 if (!defined('WP_TESTS_FORCE_KNOWN_BUGS')) {
 	define('WP_TESTS_FORCE_KNOWN_BUGS', false);
 }
 
-// Cron tries to make an HTTP request to the blog, which always fails, because tests are run in CLI mode only
-define('DISABLE_WP_CRON', true);
+// Cron tries to make an HTTP request to the blog, which always fails, because tests are run in CLI mode only.
+if(!defined('DISABLE_WP_CRON')){
+		define('DISABLE_WP_CRON', true);
+}
 
 define('REST_TESTS_IMPOSSIBLY_HIGH_NUMBER', 99999999);
 

src/tad/WPBrowser/Module/WPLoader/FactoryStore.php

@@ -101,13 +101,14 @@ public function __get($name)
                 $this->comment      = new \WP_UnitTest_Factory_For_Comment();
                 break;
             case 'blog':
-	            if ( ! function_exists( 'is_multisite' ) || ! is_multisite() ) {
-		            throw new ModuleException(
-			            WPLoader::class, 'The `blog` factory can only be used in multisite context:' .
-			                             'in `WPLoader` module configuration set `multisite: true`; read more at ' .
-			                             'https://wpbrowser.wptestkit.dev/summary/modules/wploader#configuration'
-		            );
-	            }
+                if (! function_exists('is_multisite') || ! is_multisite()) {
+                    throw new ModuleException(
+                        WPLoader::class,
+                        'The `blog` factory can only be used in multisite context:' .
+                                         'in `WPLoader` module configuration set `multisite: true`; read more at ' .
+                                         'https://wpbrowser.wptestkit.dev/summary/modules/wploader#configuration'
+                    );
+                }
                 $this->blog         = new \WP_UnitTest_Factory_For_Blog();
                 break;
             case 'network':

tests/wploader_multisite/FactoryTest.php

@@ -1,12 +1,14 @@
 <?php
 
-class FactoryTest extends \Codeception\TestCase\WPTestCase {
-	/**
-	 * It should expose the blog factory on the tester property
-	 *
-	 * @test
-	 */
-	public function should_expose_the_blog_factory_on_the_tester_property() {
-		$this->assertInstanceOf( WP_UnitTest_Factory_For_Blog::class, $this->tester->factory()->blog );
-	}
+class FactoryTest extends \Codeception\TestCase\WPTestCase
+{
+    /**
+     * It should expose the blog factory on the tester property
+     *
+     * @test
+     */
+    public function should_expose_the_blog_factory_on_the_tester_property()
+    {
+        $this->assertInstanceOf(WP_UnitTest_Factory_For_Blog::class, $this->tester->factory()->blog);
+    }
 }

tests/wploadersuite/FactoryTest.php

@@ -43,14 +43,15 @@ public function should_expose_each_factory_type_on_the_factory_property($factory
         $this->assertInstanceOf($factoryClass, $this->tester->factory()->{$factoryType});
     }
 
-	/**
-	 * It should throw if trying to use blog factory when not in multi-site context
-	 *
-	 * @test
-	 */
-	public function should_throw_if_trying_to_use_blog_factory_when_not_in_multi_site_context() {
-		$this->expectException(ModuleException::class);
+    /**
+     * It should throw if trying to use blog factory when not in multi-site context
+     *
+     * @test
+     */
+    public function should_throw_if_trying_to_use_blog_factory_when_not_in_multi_site_context()
+    {
+        $this->expectException(ModuleException::class);
 
-		$this->tester->factory()->blog;
-	}
+        $this->tester->factory()->blog;
+    }
 }