<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45445] trunk: Build/Test Tools: Remove the dependency on a globally installed Grunt.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45445">45445</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45445","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-26 19:34:24 +0000 (Sun, 26 May 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Remove the dependency on a globally installed Grunt.
The existing `"grunt": "grunt"` script in `package.json` allows for the use of `npm run grunt ...` which uses the local `grunt` binary in the project's `node_modules`.
Fixes <a href="https://core.trac.wordpress.org/ticket/47380">#47380</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkappveyoryml">trunk/appveyor.yml</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/.travis.yml 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> - node --version
</span><span class="cx" style="display: block; padding: 0 10px"> - nvm install 10.13.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- npm install -g grunt-cli
</del><span class="cx" style="display: block; padding: 0 10px"> - npm install
</span><span class="cx" style="display: block; padding: 0 10px"> - npm prune
</span><span class="cx" style="display: block; padding: 0 10px"> - mysql --version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,11 +100,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - which phpunit
</span><span class="cx" style="display: block; padding: 0 10px"> - phpunit --version
</span><span class="cx" style="display: block; padding: 0 10px"> - curl --version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- grunt --version
</del><span class="cx" style="display: block; padding: 0 10px"> - git --version
</span><span class="cx" style="display: block; padding: 0 10px"> - svn --version
</span><span class="cx" style="display: block; padding: 0 10px"> - locale -a
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-script: grunt $WP_TRAVISCI
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+script: npm run grunt $WP_TRAVISCI
</ins><span class="cx" style="display: block; padding: 0 10px"> after_script:
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><span class="cx" style="display: block; padding: 0 10px"> if [[ "$WP_TEST_REPORTER" == "true" ]]; then
</span></span></pre></div>
<a id="trunkappveyoryml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/appveyor.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/appveyor.yml 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/appveyor.yml 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> install:
</span><span class="cx" style="display: block; padding: 0 10px"> - ps: Install-Product node $env:nodejs_version
</span><span class="cx" style="display: block; padding: 0 10px"> - npm install npm -g
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - npm install grunt-cli -g
</del><span class="cx" style="display: block; padding: 0 10px"> - npm install
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> before_build:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - npm --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> build_script:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - cmd: "grunt build"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - cmd: "npm run build"
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> test: off
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package.json 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/package.json 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "check-node-version": "3.2.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "copy-webpack-plugin": "^4.6.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "cssnano": "4.1.8",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "grunt": "~1.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "grunt": "1.0.4",
</ins><span class="cx" style="display: block; padding: 0 10px"> "grunt-banner": "^0.6.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-clean": "~2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-concat": "~1.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "matchdep": "~2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "node-sass": "~4.12.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "source-map-loader": "^0.2.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "uglify-js": "^3.4.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "uglify-js": "3.5.15",
</ins><span class="cx" style="display: block; padding: 0 10px"> "uglifyjs-webpack-plugin": "2.1.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack": "4.29.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack-dev-server": "3.1.14",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,6 +113,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "whatwg-fetch": "3.0.0"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "scripts": {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "build": "grunt build",
+ "dev": "grunt build --dev",
+ "test": "grunt test",
+ "watch": "grunt watch",
</ins><span class="cx" style="display: block; padding: 0 10px"> "grunt": "grunt"
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/index.php 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/src/index.php 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,24 +34,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: npm install */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running %s.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Before running any build tasks you need to make sure the dependencies are installed. You can install these by running %s.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code style="color: green;">npm install</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<li>' . __( 'To build WordPress while developing, run:' ) . '<br /><br />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die .= '<code style="color: green;">grunt build --dev</code></li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$die .= '<code style="color: green;">npm run dev</code></li>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<li>' . __( 'To build files automatically when changing the source files, run:' ) . '<br /><br />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die .= '<code style="color: green;">grunt watch</code></li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$die .= '<code style="color: green;">npm run watch</code></li>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<li>' . __( 'To create a production build of WordPress, run:' ) . '<br /><br />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die .= '<code style="color: green;">grunt build</code></li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$die .= '<code style="color: green;">npm run build</code></li>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: NPM URL, 2: Grunt URL, 3: Handbook URL */
- __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: NPM URL, 2: Handbook URL */
+ __( 'This requires <a href="%1$s">NPM</a>. <a href="%2$s">Read more about setting up your local development environment</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://www.npmjs.com/get-npm',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://gruntjs.com/getting-started',
</del><span class="cx" style="display: block; padding: 0 10px"> __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/src/wp-includes/embed.php 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * statement below. This is used by the `grunt build` process to directly
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * statement below. This is used by the `npm run build` process to directly
</ins><span class="cx" style="display: block; padding: 0 10px"> * include a minified version of wp-embed.js, instead of using the
</span><span class="cx" style="display: block; padding: 0 10px"> * file_get_contents() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,7 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * statement below. This is used by the `grunt build` process to directly
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * statement below. This is used by the `npm run build` process to directly
</ins><span class="cx" style="display: block; padding: 0 10px"> * include a minified version of wp-oembed-embed.css, instead of using the
</span><span class="cx" style="display: block; padding: 0 10px"> * readfile() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,7 +1039,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * statement below. This is used by the `grunt build` process to directly
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * statement below. This is used by the `npm run build` process to directly
</ins><span class="cx" style="display: block; padding: 0 10px"> * include a minified version of wp-embed-template.js, instead of using the
</span><span class="cx" style="display: block; padding: 0 10px"> * readfile() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/src/wp-includes/formatting.php 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5520,7 +5520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If you're looking at a src version of this file, you'll see an "include"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * statement below. This is used by the `grunt build` process to directly
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * statement below. This is used by the `npm run build` process to directly
</ins><span class="cx" style="display: block; padding: 0 10px"> * include a minified version of wp-emoji-loader.js, instead of using the
</span><span class="cx" style="display: block; padding: 0 10px"> * readfile() method from above.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5736,7 +5736,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns arrays of emoji data.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * These arrays are automatically built from the regex in twemoji.js - if they need to be updated,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * you should update the regex there, then run the `grunt precommit:emoji` job.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * you should update the regex there, then run the `npm run grunt precommit:emoji` job.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span></span></pre></div>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/tests/phpunit/includes/bootstrap.php 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "ERROR: The /build/ directory is missing! Please run `grunt build` prior to running PHPUnit.\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "ERROR: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> exit( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php 2019-05-26 19:04:58 UTC (rev 45444)
+++ trunk/tests/phpunit/tests/oembed/template.php 2019-05-26 19:34:24 UTC (rev 45445)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * So this test checks for ampersands in build/wp-includes/js/wp-embed.min.js.
</span><span class="cx" style="display: block; padding: 0 10px"> * In many cases, this file will not exist; in those cases, we simply skip the test.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * So when would it be run? We have Travis CI run `grunt test` which then runs, in order,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * So when would it be run? We have Travis CI run `npm run test` which then runs, in order,
</ins><span class="cx" style="display: block; padding: 0 10px"> * `qunit:compiled` (which runs the build) and then `phpunit`. Thus, this test will at least be
</span><span class="cx" style="display: block; padding: 0 10px"> * run during continuous integration.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>