cuked-zombie
Advanced tools
Comparing version 1.1.1 to 1.1.2
@@ -6,2 +6,4 @@ var createProxy = require("./src/js/create-proxy"); | ||
Zombie: require('zombie'), | ||
infect: function(cucumberStep, options) { | ||
@@ -8,0 +10,0 @@ var infected = {}; |
{ | ||
"name": "cuked-zombie", | ||
"version": "1.1.1", | ||
"version": "1.1.2", | ||
"description": "use cucumber and acceptance tests with zombie", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -10,2 +10,4 @@ var _ = require('lodash'); | ||
try { | ||
cucumberScope.setStepCallback(cucumberCallback); | ||
return step.apply(cucumberScope, args); | ||
@@ -12,0 +14,0 @@ |
@@ -28,2 +28,7 @@ module.exports = function(options) { | ||
this.cucumberCallback = undefined; | ||
this.setStepCallback = function(cucumberCallback) { | ||
that.cucumberCallback = cucumberCallback; | ||
}; | ||
this.util = require('./zombie-utils')(that); | ||
@@ -56,2 +61,8 @@ | ||
this.browser.on("opened", function(window) { | ||
// make Raphael run in zombie without quitting silently | ||
window.SVGAngle = {}; | ||
window.window.SVGAngle = {}; | ||
}); | ||
_.each(options.cookies || {}, function(cookie) { | ||
@@ -69,3 +80,3 @@ that.browser.cookies.set(_.defaults(cookie, { domain: options.domain})); | ||
this.visit = function(url, callback) { | ||
this.visit = function(url, callback, cucumberCallback) { | ||
that.browser.visit(url, function(error) { | ||
@@ -83,3 +94,9 @@ /* | ||
if (error) { | ||
throw error; | ||
if (cucumberCallback) { | ||
cucumberCallback.fail(error); | ||
} else if (that.cucumberCallback) { | ||
that.cucumberCallback.fail(error); | ||
} else { | ||
throw error; | ||
} | ||
} else { | ||
@@ -155,3 +172,3 @@ callback.call(that, that.browser); | ||
this.visitPage = function(path, callback) { | ||
this.visitPage = function(path, callback, cucumberCallback) { | ||
return that.visit(path, function() { | ||
@@ -161,3 +178,3 @@ that.pageHasChanged(function() { | ||
}); | ||
}); | ||
}, cucumberCallback); | ||
}; | ||
@@ -164,0 +181,0 @@ |
172329
826