fix: don't assume handler is installed as global executable

Close #4
apiaryio · May 28, 2019 · 69479e0 · 69479e0
1 parent ae41b82
commit 69479e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/features/execution_order.feature b/features/execution_order.feature
@@ -1,8 +1,7 @@
 Feature: Execution order
 
   Background:
-    Given I have "{{my-executable-path}}" command installed
-    And I have "dredd" command installed
+    Given I have Dredd installed
     And a file named "server.js" with:
       """
       require('http')

diff --git a/features/failing_transaction.feature b/features/failing_transaction.feature
@@ -1,8 +1,7 @@
 Feature: Failing a transaction
 
   Background:
-    Given I have "{{my-executable-path}}" command installed
-    And I have "dredd" command installed
+    Given I have Dredd installed
     And a file named "server.js" with:
       """
       require('http')

diff --git a/features/hook_handlers.feature b/features/hook_handlers.feature
@@ -1,8 +1,7 @@
 Feature: Hook handlers
 
   Background:
-    Given I have "{{my-executable-path}}" command installed
-    And I have "dredd" command installed
+    Given I have Dredd installed
     And a file named "server.js" with:
       """
       require('http')

diff --git a/features/multiple_hookfiles.feature b/features/multiple_hookfiles.feature
@@ -1,8 +1,7 @@
 Feature: Multiple hook files with a glob
 
   Background:
-    Given I have "{{my-executable-path}}" command installed
-    And I have "dredd" command installed
+    Given I have Dredd installed
     And a file named "server.js" with:
       """
       require('http')

diff --git a/features/support/steps.js b/features/support/steps.js
@@ -25,11 +25,8 @@ After(async function () {
 });
 
 
-Given(/^I have "([^"]+)" command installed$/, function (match) {
-  const command = match === 'dredd'
-    ? DREDD_BIN
-    : match;
-  which.sync(command); // throws if the command is not found
+Given('I have Dredd installed', function () {
+  which.sync(DREDD_BIN); // throws if not found
 });
 
 Given(/^a file named "([^"]+)" with:$/, function (filename, content) {
@@ -41,9 +38,8 @@ Given(/^I set the environment variables to:$/, function (env) {
 });
 
 
-When(/^I run `([^`]+)`$/, function (match) {
-  const command = match.replace(/^dredd(?= )/, DREDD_BIN);
-  this.proc = childProcess.spawnSync(command, [], {
+When(/^I run `dredd ([^`]+)`$/, function (args) {
+  this.proc = childProcess.spawnSync(`${DREDD_BIN} ${args}`, [], {
     shell: true,
     cwd: this.dir,
     env: this.env,
@@ -71,6 +67,7 @@ When('I wait for output to contain {string}', function (output, callback) {
 
   proc.stdout.on('data', read);
   proc.stderr.on('data', read);
+  proc.on('error', callback);
 });
 
 When('I connect to the server', async function () {