Merge pull request #82 from mirkootter/master

Add Windows Support

Author: ampersarnie

lib/cli/commands/reset.js

@@ -32,14 +32,10 @@ const reset = async (packageDir, logFile, options) => {
   const locale = get(config, ['locale'], 'en_US');
 
   await run(
-    async () => wpcli(`core config \
-    --dbhost=db \
-    --dbname=wordpress \
-    --dbuser=root \
-    --dbpass='' \
-    --locale=${locale} \
-    --extra-php <<PHP
-define( 'FS_METHOD', 'direct' );
+    async () => wpcli(
+      `core config --dbhost=db --dbname=wordpress --dbuser=root --dbpass="" --locale=${locale} --extra-php`,
+      logFile,
+      `define( 'FS_METHOD', 'direct' );
 
 ${map(config.config, (value, key) => `
 define( '${key}', ${isString(value) ? `'${value}'` : value} );`).join('')}
@@ -49,13 +45,12 @@ if ( file_exists( __DIR__ . '/wp-cypress-config.php' ) ) {
 }
 
 if( file_exists ( ABSPATH . '.userid' ) ) {
-  function wp_validate_auth_cookie( \\$cookie='', \\$scheme='' ) {
+  function wp_validate_auth_cookie( $cookie='', $scheme='' ) {
     return file_get_contents( ABSPATH . '.userid' );
   }
 }
-
-PHP
-`, logFile),
+`,
+    ),
     'Creating wp-config.php',
     'wp-config.php created',
     logFile,

lib/cypress-support/commands.js

@@ -1,19 +1,22 @@
 require('./hooks');
 require('./setSelection');
 
+const wpCypress = Cypress.platform === 'win32'
+  ? 'node_modules\\.bin\\wp-cypress' : 'node_modules/.bin/wp-cypress';
+
 const commands = {
   wp(command) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "${command}"`);
+    cy.exec(`${wpCypress} wp "${command}"`);
   },
 
   seed(seeder) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "seed ${seeder}"`).then((result) => {
+    cy.exec(`${wpCypress} wp "seed ${seeder}"`).then((result) => {
       cy.log(result.stdout);
     });
   },
 
   seedClean(seeder) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "seed ${seeder} --clean"`).then(
+    cy.exec(`${wpCypress} wp "seed ${seeder} --clean"`).then(
       (result) => {
         cy.log(result.stdout);
       },
@@ -22,7 +25,7 @@ const commands = {
 
   cleanThenSeed(seeder) {
     cy.exec(
-      `node_modules/.bin/wp-cypress wp "seed ${seeder} --clean-first"`,
+      `${wpCypress} wp "seed ${seeder} --clean-first"`,
     ).then((result) => {
       cy.log(result.stdout);
     });
@@ -31,27 +34,27 @@ const commands = {
   resetWP(version = false) {
     const wpVersion = version || (Cypress.wp || {}).version || false;
     cy.log('WP Cypress: performing full teardown...');
-    cy.exec(`node_modules/.bin/wp-cypress soft-reset ${wpVersion ? `--version='${wpVersion}'` : ''}`);
+    cy.exec(`${wpCypress} soft-reset ${wpVersion ? `--version="${wpVersion}"` : ''}`);
   },
 
   installTheme(name) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "theme install ${name}"`);
+    cy.exec(`${wpCypress} wp "theme install ${name}"`);
   },
 
   activateTheme(name) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "theme activate ${name}"`);
+    cy.exec(`${wpCypress} wp "theme activate ${name}"`);
   },
 
   installPlugin(name) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "plugin install ${name}"`);
+    cy.exec(`${wpCypress} wp "plugin install ${name}"`);
   },
 
   activatePlugin(name) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "plugin activate ${name}"`);
+    cy.exec(`${wpCypress} wp "plugin activate ${name}"`);
   },
 
   deactivatePlugin(name) {
-    cy.exec(`node_modules/.bin/wp-cypress wp "plugin deactivate ${name}"`);
+    cy.exec(`${wpCypress} wp "plugin deactivate ${name}"`);
   },
 
   visitAdmin(options = {}) {
@@ -68,7 +71,7 @@ const commands = {
 
   switchUser(user = 'admin', password = null) {
     if (password) {
-      cy.exec('node_modules/.bin/wp-cypress wp "wp-cypress-set-user --logout"').then(() => {
+      cy.exec(`${wpCypress} wp "wp-cypress-set-user --logout"`).then(() => {
         cy.clearCookies();
         cy.visit('/wp-login.php?loggedout=true');
 
@@ -84,12 +87,12 @@ const commands = {
         cy.get('#wp-submit').click();
       });
     } else {
-      cy.exec(`node_modules/.bin/wp-cypress wp "wp-cypress-set-user ${user}"`);
+      cy.exec(`${wpCypress} wp "wp-cypress-set-user ${user}"`);
     }
   },
 
   logout() {
-    cy.exec('node_modules/.bin/wp-cypress wp "wp-cypress-set-user --logout"').then(() => {
+    cy.exec(`${wpCypress} wp "wp-cypress-set-user --logout"`).then(() => {
       cy.clearCookies();
       cy.visit('/wp-login.php?loggedout=true');
     });

lib/modules/exec.js

@@ -1,12 +1,22 @@
 const shell = require('shelljs');
 
-const exec = (cmd, logFile) => new Promise((resolve) => {
-  const child = shell.exec(cmd, {
-    async: true,
-    silent: true,
-  }, (code, stdout, stderr) => {
-    resolve({ code, stdout, stderr });
-  });
+const exec = (cmd, logFile, stdin) => new Promise((resolve) => {
+  let child;
+  if (stdin) {
+    child = new shell.ShellString(stdin).exec(cmd, {
+      async: true,
+      silent: true,
+    }, (code, stdout, stderr) => {
+      resolve({ code, stdout, stderr });
+    });
+  } else {
+    child = shell.exec(cmd, {
+      async: true,
+      silent: true,
+    }, (code, stdout, stderr) => {
+      resolve({ code, stdout, stderr });
+    });
+  }
 
   if (!logFile) {
     return;
@@ -27,6 +37,6 @@ const exec = (cmd, logFile) => new Promise((resolve) => {
 
 module.exports = {
   exec,
-  cli: (command, logFile) => exec(`docker-compose exec -T wp ${command}`, logFile),
-  wpcli: (command, logFile) => exec(`docker-compose exec -T wp wp --allow-root ${command}`, logFile),
+  cli: (command, logFile, stdin) => exec(`docker-compose exec -T wp ${command}`, logFile, stdin),
+  wpcli: (command, logFile, stdin) => exec(`docker-compose exec -T wp wp --allow-root ${command}`, logFile, stdin),
 };