Merge branch 'develop' into enhancement/860-update-deprecated-lifecyc…

…le-methods
sayanm085 · Apr 27, 2020 · cb517bc · cb517bc
2 parents 4d49d35 + 259aac7
commit cb517bc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/bin/local-env/env-check.sh b/bin/local-env/env-check.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Exit if any command fails
+set -e
+
+# Include useful functions
+. "$(dirname "$0")/includes.sh"
+
+# Get the host port for the WordPress container.
+HOST_PORT=$(dc port $CONTAINER 80 | awk -F : '{printf $2}')
+
+# Check for the site status
+if [[ -z $(curl -s --head --fail http://localhost:$HOST_PORT) ]]; then
+	echo -e $(status_message 'E2E environment is not running, starting it now...')
+	npm run env:start
+fi
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php
@@ -265,6 +265,7 @@ function () {
 		};
 		add_action( 'update_option_home', $option_updated );
 		add_action( 'update_option_siteurl', $option_updated );
+		add_action( 'update_option_blogname', $option_updated );
 		add_action( 'update_option_googlesitekit_db_version', $option_updated );
 	}
 

diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "test:analyze": "npm run build:production -- --env.analyze=true --json --progress --profile > /tmp/stats.json && cp ./dist/assets/js/*.js /tmp && webpack-bundle-analyzer /tmp/stats.json",
     "test:js": "wp-scripts test-unit-js --config=tests/js/jest.config.js",
     "test:js:watch": "wp-scripts test-unit-js --config=tests/js/jest.config.js --watch",
+    "pretest:e2e": "./bin/local-env/env-check.sh",
     "test:e2e": "WP_BASE_URL=http://localhost:9002 wp-scripts test-e2e --config=tests/e2e/jest.config.js",
     "test:e2e:interactive": "npm run test:e2e -- --puppeteer-interactive",
     "test:e2e:ci": "npm run test:e2e -- --runInBand",