From 36582ca77219a2d4a0117bafc54e6bbe42149ad9 Mon Sep 17 00:00:00 2001 From: Garris Shpon Date: Fri, 24 Jul 2020 15:40:12 -0700 Subject: [PATCH] backstop remote command takes --config arg Modified /command/remote to pass config.backstopConfigFileName to "remote" child process. Modified Remote script to set PROJECT_PATH and PATH_TO_CONFIG on passed values only. --- core/command/remote.js | 6 ++---- remote/index.js | 11 ++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/command/remote.js b/core/command/remote.js index 30a76f749..643920f84 100644 --- a/core/command/remote.js +++ b/core/command/remote.js @@ -6,15 +6,13 @@ const ssws = resolver.sync('super-simple-web-server', { basedir: __dirname }); module.exports = { execute: function (config) { - logger.log('Starting remote.'); - const MIDDLEWARE_PATH = path.resolve(config.backstop, 'remote'); const projectPath = path.resolve(config.projectPath); return new Promise(function (resolve, reject) { - logger.log(`Starting remote with: node ${ssws} ${projectPath} ${MIDDLEWARE_PATH}`); + logger.log(`Starting remote with: node ${ssws} ${projectPath} ${MIDDLEWARE_PATH} --config=${config.backstopConfigFileName}`); - const child = exec(`node ${ssws} ${projectPath} ${MIDDLEWARE_PATH}`); + const child = exec(`node ${ssws} ${projectPath} ${MIDDLEWARE_PATH} --config=${config.backstopConfigFileName}`); child.stdout.on('data', (data) => { logger.log(data); diff --git a/remote/index.js b/remote/index.js index 87e2a5ac4..c3ea47c63 100644 --- a/remote/index.js +++ b/remote/index.js @@ -1,12 +1,17 @@ /* eslint no-console: off */ 'use strict'; +var parseArgs = require('minimist'); +var argsOptions = parseArgs(process.argv.slice(2), { + string: ['config'] +}); +var PROJECT_PATH = argsOptions._[0]; +var PATH_TO_CONFIG = argsOptions.config; +var _config = require(argsOptions.config); + var path = require('path'); var express = require('express'); var backstop = require('../core/runner'); -var PROJECT_PATH = process.cwd(); -var PATH_TO_CONFIG = path.resolve(PROJECT_PATH, 'backstop'); -var _config = require(PATH_TO_CONFIG); var { modifyJsonpReport } = require('../core/util/remote'); module.exports = function (app) {