Merge pull request #58 from apiaryio/honzajavorek/simplify-server

Simplify server steps

Author: honzajavorek

features/execution_order.feature

@@ -2,21 +2,6 @@ Feature: Execution order
 
   Background:
     Given I have Dredd installed
-    And a file named "server.js" with:
-      """
-      require('http')
-        .createServer((req, res) => {
-          if (req.url === '/message') {
-            res.writeHead(200, { 'Content-Type': 'text/plain' });
-            res.end('Hello World!\n');
-          } else {
-            res.writeHead(500);
-            res.end();
-          }
-        })
-        .listen(4567);
-      """
-
     And a file named "apiary.apib" with:
       """
       # My Api
@@ -25,6 +10,7 @@ Feature: Execution order
 
               Hello World!
       """
+    And a file "server.js" with a server responding on "http://localhost:4567/message" with "Hello World!"
 
   Scenario:
     Given a file named "hookfile.{{my-extension}}" with:

features/failing_transaction.feature

@@ -2,21 +2,6 @@ Feature: Failing a transaction
 
   Background:
     Given I have Dredd installed
-    And a file named "server.js" with:
-      """
-      require('http')
-        .createServer((req, res) => {
-          if (req.url === '/message') {
-            res.writeHead(200, { 'Content-Type': 'text/plain' });
-            res.end('Hello World!\n');
-          } else {
-            res.writeHead(500);
-            res.end();
-          }
-        })
-        .listen(4567);
-      """
-
     And a file named "apiary.apib" with:
       """
       # My Api
@@ -25,6 +10,7 @@ Feature: Failing a transaction
 
               Hello World!
       """
+    And a file "server.js" with a server responding on "http://localhost:4567/message" with "Hello World!"
 
   Scenario:
     Given a file named "hookfile.{{my-extension}}" with:

features/hook_handlers.feature

@@ -2,21 +2,6 @@ Feature: Hook handlers
 
   Background:
     Given I have Dredd installed
-    And a file named "server.js" with:
-      """
-      require('http')
-        .createServer((req, res) => {
-          if (req.url === '/message') {
-            res.writeHead(200, { 'Content-Type': 'text/plain' });
-            res.end('Hello World!\n');
-          } else {
-            res.writeHead(500);
-            res.end();
-          }
-        })
-        .listen(4567);
-      """
-
     And a file named "apiary.apib" with:
       """
       # My Api
@@ -25,6 +10,7 @@ Feature: Hook handlers
 
               Hello World!
       """
+    And a file "server.js" with a server responding on "http://localhost:4567/message" with "Hello World!"
 
   Scenario:
     Given a file named "hookfile.{{my-extension}}" with:

features/multiple_hookfiles.feature

@@ -2,21 +2,6 @@ Feature: Multiple hook files with a glob
 
   Background:
     Given I have Dredd installed
-    And a file named "server.js" with:
-      """
-      require('http')
-        .createServer((req, res) => {
-          if (req.url === '/message') {
-            res.writeHead(200, { 'Content-Type': 'text/plain' });
-            res.end('Hello World!\n');
-          } else {
-            res.writeHead(500);
-            res.end();
-          }
-        })
-        .listen(4567);
-      """
-
     And a file named "apiary.apib" with:
       """
       # My Api
@@ -25,6 +10,7 @@ Feature: Multiple hook files with a glob
 
               Hello World!
       """
+    And a file "server.js" with a server responding on "http://localhost:4567/message" with "Hello World!"
 
   Scenario:
     Given a file named "hookfile1.{{my-extension}}" with:

features/support/steps.js

@@ -5,6 +5,7 @@ const childProcess = require('child_process');
 const { expect } = require('chai');
 const fs = require('fs-extra');
 const net = require('net');
+const url = require('url');
 const which = require('which');
 const kill = require('tree-kill');
 const {
@@ -33,11 +34,29 @@ Given('I have Dredd installed', function step() {
   which.sync(this.dreddBin); // throws if not found
 });
 
-Given(/^a file named "([^"]+)" with:$/, function step(filename, content) {
+Given('a file {string} with a server responding on {string} with {string}', function step(filename, fullURL, body) {
+  const urlParts = url.parse(fullURL);
+  const content = `
+require('http')
+  .createServer((req, res) => {
+    if (req.url === '${urlParts.path}') {
+      res.writeHead(200, { 'Content-Type': 'text/plain' });
+      res.end('${body}\\n');
+    } else {
+      res.writeHead(500);
+      res.end();
+    }
+  })
+  .listen(${urlParts.port});
+`;
+  fs.writeFileSync(path.join(this.dir, filename), content);
+});
+
+Given('a file named {string} with:', function step(filename, content) {
   fs.writeFileSync(path.join(this.dir, filename), content);
 });
 
-Given(/^I set the environment variables to:$/, function step(env) {
+Given('I set the environment variables to:', function step(env) {
   this.env = { ...this.env, ...env.rowsHash() };
 });