Fixed testing the bdd integration tests for docker.

spira · Jun 11, 2015 · 524a1eb · 524a1eb
1 parent 42a5ac7
commit 524a1eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/features/steps/homeSteps.js b/features/steps/homeSteps.js
@@ -15,7 +15,6 @@ module.exports = function() {
         this.driver.get(this.baseUrl+'/');
 
         next();
-
     });
 
     this.Then(/^I should see "(.*)" as the page title$/, function (title, next) {
@@ -25,7 +24,6 @@ module.exports = function() {
             expect(pageTitle).to.equal(title);
 
             next();
-
         });
 
     });
@@ -36,6 +34,7 @@ module.exports = function() {
             .then(function(text) {
 
                 expect(text).to.equal(heading);
+
                 next();
             });
 

diff --git a/features/support/world.js b/features/support/world.js
@@ -28,6 +28,10 @@ var World = function World(callback) {
         this.baseUrl = 'http://127.0.0.1:8001';
     }
 
+    if (!!process.env.NGINX_PORT_80_TCP){ //if we are executing from a docker container
+        this.baseUrl = 'http://' + process.env.NGINX_PORT_80_TCP_ADDR; //rewrite it to the nginx container tcp address
+    }
+
     this.waitFor = function(cssLocator, timeout) {
         var waitTimeout = timeout || defaultTimeout;
         return driver.wait(function() {