poltergeist 1.5.1 → 1.6.0

data/lib/capybara/poltergeist/client/compiled/main.js

@@ -1,4 +1,4 @@
-var Poltergeist, _ref,
+var Poltergeist, system, _ref, _ref1, _ref2,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
@@ -175,6 +175,42 @@ Poltergeist.BrowserError = (function(_super) {
 
 })(Poltergeist.Error);
 
+Poltergeist.StatusFailError = (function(_super) {
+  __extends(StatusFailError, _super);
+
+  function StatusFailError() {
+    _ref1 = StatusFailError.__super__.constructor.apply(this, arguments);
+    return _ref1;
+  }
+
+  StatusFailError.prototype.name = "Poltergeist.StatusFailError";
+
+  StatusFailError.prototype.args = function() {
+    return [];
+  };
+
+  return StatusFailError;
+
+})(Poltergeist.Error);
+
+Poltergeist.NoSuchWindowError = (function(_super) {
+  __extends(NoSuchWindowError, _super);
+
+  function NoSuchWindowError() {
+    _ref2 = NoSuchWindowError.__super__.constructor.apply(this, arguments);
+    return _ref2;
+  }
+
+  NoSuchWindowError.prototype.name = "Poltergeist.NoSuchWindowError";
+
+  NoSuchWindowError.prototype.args = function() {
+    return [];
+  };
+
+  return NoSuchWindowError;
+
+})(Poltergeist.Error);
+
 phantom.injectJs("" + phantom.libraryPath + "/web_page.js");
 
 phantom.injectJs("" + phantom.libraryPath + "/node.js");
@@ -183,4 +219,6 @@ phantom.injectJs("" + phantom.libraryPath + "/connection.js");
 
 phantom.injectJs("" + phantom.libraryPath + "/browser.js");
 
-new Poltergeist(phantom.args[0], phantom.args[1], phantom.args[2]);
+system = require('system');
+
+new Poltergeist(system.args[1], system.args[2], system.args[3]);

data/lib/capybara/poltergeist/client/compiled/node.js

@@ -4,7 +4,7 @@ Poltergeist.Node = (function() {
   var name, _fn, _i, _len, _ref,
     _this = this;
 
-  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText'];
+  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'getAttributes', 'isVisible', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection'];
 
   function Node(page, id) {
     this.page = page;
@@ -47,7 +47,12 @@ Poltergeist.Node = (function() {
     pos = this.mouseEventPosition();
     test = this.mouseEventTest(pos.x, pos.y);
     if (test.status === 'success') {
-      this.page.mouseEvent(name, pos.x, pos.y);
+      if (name === 'rightclick') {
+        this.page.mouseEvent('click', pos.x, pos.y, 'right');
+        this.trigger('contextmenu');
+      } else {
+        this.page.mouseEvent(name, pos.x, pos.y);
+      }
       return pos;
     } else {
       throw new Poltergeist.MouseEventFailed(name, test.selector, pos);

data/lib/capybara/poltergeist/client/compiled/web_page.js

@@ -1,26 +1,32 @@
-var __slice = [].slice;
+var __slice = [].slice,
+  __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
 Poltergeist.WebPage = (function() {
   var command, delegate, _fn, _fn1, _i, _j, _len, _len1, _ref, _ref1,
     _this = this;
 
-  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated'];
+  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
 
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward'];
 
-  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload'];
+  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
 
   WebPage.EXTENSIONS = [];
 
   function WebPage(_native) {
     var callback, _i, _len, _ref;
-    this["native"] = _native;
-    this["native"] || (this["native"] = require('webpage').create());
-    this._source = null;
-    this._errors = [];
-    this._networkTraffic = {};
-    this._temp_headers = {};
+    this._native = _native;
+    this._native || (this._native = require('webpage').create());
+    this.id = 0;
+    this.source = null;
+    this.closed = false;
+    this.state = 'default';
+    this.urlBlacklist = [];
     this.frames = [];
+    this.errors = [];
+    this._networkTraffic = {};
+    this._tempHeaders = {};
+    this._blockedUrls = [];
     _ref = WebPage.CALLBACKS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       callback = _ref[_i];
@@ -44,7 +50,7 @@ Poltergeist.WebPage = (function() {
   _ref1 = WebPage.DELEGATES;
   _fn1 = function(delegate) {
     return WebPage.prototype[delegate] = function() {
-      return this["native"][delegate].apply(this["native"], arguments);
+      return this._native[delegate].apply(this._native, arguments);
     };
   };
   for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
@@ -53,7 +59,8 @@ Poltergeist.WebPage = (function() {
   }
 
   WebPage.prototype.onInitializedNative = function() {
-    this._source = null;
+    this.id += 1;
+    this.source = null;
     this.injectAgent();
     this.removeTempHeaders();
     return this.setScrollPosition({
@@ -62,44 +69,29 @@ Poltergeist.WebPage = (function() {
     });
   };
 
-  WebPage.prototype.injectAgent = function() {
-    var extension, _k, _len2, _ref2, _results;
-    if (this["native"].evaluate(function() {
-      return typeof __poltergeist;
-    }) === "undefined") {
-      this["native"].injectJs("" + phantom.libraryPath + "/agent.js");
-      _ref2 = WebPage.EXTENSIONS;
-      _results = [];
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        extension = _ref2[_k];
-        _results.push(this["native"].injectJs(extension));
-      }
-      return _results;
-    }
-  };
-
-  WebPage.prototype.injectExtension = function(file) {
-    WebPage.EXTENSIONS.push(file);
-    return this["native"].injectJs(file);
+  WebPage.prototype.onClosingNative = function() {
+    this.handle = null;
+    return this.closed = true;
   };
 
   WebPage.prototype.onConsoleMessageNative = function(message) {
     if (message === '__DOMContentLoaded') {
-      this._source = this["native"].content;
+      this.source = this._native.content;
       return false;
+    } else {
+      return console.log(message);
     }
   };
 
   WebPage.prototype.onLoadStartedNative = function() {
+    this.state = 'loading';
     return this.requestId = this.lastRequestId;
   };
 
-  WebPage.prototype.onLoadFinishedNative = function() {
-    return this._source || (this._source = this["native"].content);
-  };
-
-  WebPage.prototype.onConsoleMessage = function(message) {
-    return console.log(message);
+  WebPage.prototype.onLoadFinishedNative = function(status) {
+    this.status = status;
+    this.state = 'default';
+    return this.source || (this.source = this._native.content);
   };
 
   WebPage.prototype.onErrorNative = function(message, stack) {
@@ -112,22 +104,33 @@ Poltergeist.WebPage = (function() {
         return stackString += " in " + frame["function"];
       }
     });
-    return this._errors.push({
+    return this.errors.push({
       message: message,
       stack: stackString
     });
   };
 
-  WebPage.prototype.onResourceRequestedNative = function(request) {
-    this.lastRequestId = request.id;
-    if (request.url === this.redirectURL) {
-      this.redirectURL = null;
-      this.requestId = request.id;
+  WebPage.prototype.onResourceRequestedNative = function(request, net) {
+    var abort, _ref2;
+    abort = this.urlBlacklist.some(function(blacklisted_url) {
+      return request.url.indexOf(blacklisted_url) !== -1;
+    });
+    if (abort) {
+      if (_ref2 = request.url, __indexOf.call(this._blockedUrls, _ref2) < 0) {
+        this._blockedUrls.push(request.url);
+      }
+      return net.abort();
+    } else {
+      this.lastRequestId = request.id;
+      if (request.url === this.redirectURL) {
+        this.redirectURL = null;
+        this.requestId = request.id;
+      }
+      return this._networkTraffic[request.id] = {
+        request: request,
+        responseParts: []
+      };
     }
-    return this._networkTraffic[request.id] = {
-      request: request,
-      responseParts: []
-    };
   };
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
@@ -139,15 +142,63 @@ Poltergeist.WebPage = (function() {
       if (response.redirectURL) {
         return this.redirectURL = response.redirectURL;
       } else {
-        this._statusCode = response.status;
+        this.statusCode = response.status;
         return this._responseHeaders = response.headers;
       }
     }
   };
 
+  WebPage.prototype.injectAgent = function() {
+    var extension, _k, _len2, _ref2, _results;
+    if (this["native"]().evaluate(function() {
+      return typeof __poltergeist;
+    }) === "undefined") {
+      this["native"]().injectJs("" + phantom.libraryPath + "/agent.js");
+      _ref2 = WebPage.EXTENSIONS;
+      _results = [];
+      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+        extension = _ref2[_k];
+        _results.push(this["native"]().injectJs(extension));
+      }
+      return _results;
+    }
+  };
+
+  WebPage.prototype.injectExtension = function(file) {
+    WebPage.EXTENSIONS.push(file);
+    return this["native"]().injectJs(file);
+  };
+
+  WebPage.prototype["native"] = function() {
+    if (this.closed) {
+      throw new Poltergeist.NoSuchWindowError;
+    } else {
+      return this._native;
+    }
+  };
+
+  WebPage.prototype.windowName = function() {
+    return this["native"]().windowName;
+  };
+
+  WebPage.prototype.keyCode = function(name) {
+    return this["native"]().event.key[name];
+  };
+
+  WebPage.prototype.waitState = function(state, callback) {
+    var _this = this;
+    if (this.state === state) {
+      return callback.call();
+    } else {
+      return setTimeout((function() {
+        return _this.waitState(state, callback);
+      }), 100);
+    }
+  };
+
   WebPage.prototype.setHttpAuth = function(user, password) {
-    this["native"].settings.userName = user;
-    return this["native"].settings.password = password;
+    this["native"]().settings.userName = user;
+    return this["native"]().settings.password = password;
   };
 
   WebPage.prototype.networkTraffic = function() {
@@ -158,28 +209,33 @@ Poltergeist.WebPage = (function() {
     return this._networkTraffic = {};
   };
 
-  WebPage.prototype.content = function() {
-    return this["native"].frameContent;
+  WebPage.prototype.blockedUrls = function() {
+    return this._blockedUrls;
   };
 
-  WebPage.prototype.source = function() {
-    return this._source;
+  WebPage.prototype.clearBlockedUrls = function() {
+    return this._blockedUrls = [];
   };
 
-  WebPage.prototype.title = function() {
-    return this["native"].frameTitle;
+  WebPage.prototype.content = function() {
+    return this["native"]().frameContent;
   };
 
-  WebPage.prototype.errors = function() {
-    return this._errors;
+  WebPage.prototype.title = function() {
+    return this["native"]().frameTitle;
   };
 
-  WebPage.prototype.clearErrors = function() {
-    return this._errors = [];
+  WebPage.prototype.frameUrl = function(frameName) {
+    var query;
+    query = function(frameName) {
+      var _ref2;
+      return (_ref2 = document.querySelector("iframe[name='" + frameName + "']")) != null ? _ref2.src : void 0;
+    };
+    return this.evaluate(query, frameName);
   };
 
-  WebPage.prototype.statusCode = function() {
-    return this._statusCode;
+  WebPage.prototype.clearErrors = function() {
+    return this.errors = [];
   };
 
   WebPage.prototype.responseHeaders = function() {
@@ -192,57 +248,61 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.cookies = function() {
-    return this["native"].cookies;
+    return this["native"]().cookies;
   };
 
   WebPage.prototype.deleteCookie = function(name) {
-    return this["native"].deleteCookie(name);
+    return this["native"]().deleteCookie(name);
   };
 
   WebPage.prototype.viewportSize = function() {
-    return this["native"].viewportSize;
+    return this["native"]().viewportSize;
   };
 
   WebPage.prototype.setViewportSize = function(size) {
-    return this["native"].viewportSize = size;
+    return this["native"]().viewportSize = size;
+  };
+
+  WebPage.prototype.setZoomFactor = function(zoom_factor) {
+    return this["native"]().zoomFactor = zoom_factor;
   };
 
   WebPage.prototype.setPaperSize = function(size) {
-    return this["native"].paperSize = size;
+    return this["native"]().paperSize = size;
   };
 
   WebPage.prototype.scrollPosition = function() {
-    return this["native"].scrollPosition;
+    return this["native"]().scrollPosition;
   };
 
   WebPage.prototype.setScrollPosition = function(pos) {
-    return this["native"].scrollPosition = pos;
+    return this["native"]().scrollPosition = pos;
   };
 
   WebPage.prototype.clipRect = function() {
-    return this["native"].clipRect;
+    return this["native"]().clipRect;
   };
 
   WebPage.prototype.setClipRect = function(rect) {
-    return this["native"].clipRect = rect;
+    return this["native"]().clipRect = rect;
   };
 
   WebPage.prototype.elementBounds = function(selector) {
-    return this["native"].evaluate(function(selector) {
+    return this["native"]().evaluate(function(selector) {
       return document.querySelector(selector).getBoundingClientRect();
     }, selector);
   };
 
   WebPage.prototype.setUserAgent = function(userAgent) {
-    return this["native"].settings.userAgent = userAgent;
+    return this["native"]().settings.userAgent = userAgent;
   };
 
   WebPage.prototype.getCustomHeaders = function() {
-    return this["native"].customHeaders;
+    return this["native"]().customHeaders;
   };
 
   WebPage.prototype.setCustomHeaders = function(headers) {
-    return this["native"].customHeaders = headers;
+    return this["native"]().customHeaders = headers;
   };
 
   WebPage.prototype.addTempHeader = function(header) {
@@ -250,7 +310,7 @@ Poltergeist.WebPage = (function() {
     _results = [];
     for (name in header) {
       value = header[name];
-      _results.push(this._temp_headers[name] = value);
+      _results.push(this._tempHeaders[name] = value);
     }
     return _results;
   };
@@ -258,7 +318,7 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.removeTempHeaders = function() {
     var allHeaders, name, value, _ref2;
     allHeaders = this.getCustomHeaders();
-    _ref2 = this._temp_headers;
+    _ref2 = this._tempHeaders;
     for (name in _ref2) {
       value = _ref2[name];
       delete allHeaders[name];
@@ -267,7 +327,7 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.pushFrame = function(name) {
-    if (this["native"].switchToFrame(name)) {
+    if (this["native"]().switchToFrame(name)) {
       this.frames.push(name);
       return true;
     } else {
@@ -275,21 +335,9 @@ Poltergeist.WebPage = (function() {
     }
   };
 
-  WebPage.prototype.pages = function() {
-    return this["native"].pagesWindowName;
-  };
-
   WebPage.prototype.popFrame = function() {
     this.frames.pop();
-    return this["native"].switchToParentFrame();
-  };
-
-  WebPage.prototype.getPage = function(name) {
-    var page;
-    page = this["native"].getPage(name);
-    if (page) {
-      return new Poltergeist.WebPage(page);
-    }
+    return this["native"]().switchToParentFrame();
   };
 
   WebPage.prototype.dimensions = function() {
@@ -329,22 +377,33 @@ Poltergeist.WebPage = (function() {
     return new Poltergeist.Node(this, id);
   };
 
-  WebPage.prototype.mouseEvent = function(name, x, y) {
+  WebPage.prototype.mouseEvent = function(name, x, y, button) {
+    if (button == null) {
+      button = 'left';
+    }
     this.sendEvent('mousemove', x, y);
-    return this.sendEvent(name, x, y);
+    return this.sendEvent(name, x, y, button);
   };
 
   WebPage.prototype.evaluate = function() {
     var args, fn;
     fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
     this.injectAgent();
-    return JSON.parse(this["native"].evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }"));
+    return JSON.parse(this.sanitize(this["native"]().evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }")));
+  };
+
+  WebPage.prototype.sanitize = function(potential_string) {
+    if (typeof potential_string === "string") {
+      return potential_string.replace("\n", "\\n").replace("\r", "\\r");
+    } else {
+      return potential_string;
+    }
   };
 
   WebPage.prototype.execute = function() {
     var args, fn;
     fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
-    return this["native"].evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
+    return this["native"]().evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
   };
 
   WebPage.prototype.stringifyCall = function(fn, args) {
@@ -358,7 +417,7 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.bindCallback = function(name) {
     var that;
     that = this;
-    return this["native"][name] = function() {
+    return this["native"]()[name] = function() {
       var result;
       if (that[name + 'Native'] != null) {
         result = that[name + 'Native'].apply(that, arguments);
@@ -374,29 +433,31 @@ Poltergeist.WebPage = (function() {
     result = this.evaluate(function(name, args) {
       return __poltergeist.externalCall(name, args);
     }, name, args);
-    if (result.error != null) {
-      switch (result.error.message) {
-        case 'PoltergeistAgent.ObsoleteNode':
-          throw new Poltergeist.ObsoleteNode;
-          break;
-        case 'PoltergeistAgent.InvalidSelector':
-          method = args[0], selector = args[1];
-          throw new Poltergeist.InvalidSelector(method, selector);
-          break;
-        default:
-          throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
+    if (result !== null) {
+      if (result.error != null) {
+        switch (result.error.message) {
+          case 'PoltergeistAgent.ObsoleteNode':
+            throw new Poltergeist.ObsoleteNode;
+            break;
+          case 'PoltergeistAgent.InvalidSelector':
+            method = args[0], selector = args[1];
+            throw new Poltergeist.InvalidSelector(method, selector);
+            break;
+          default:
+            throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
+        }
+      } else {
+        return result.value;
       }
-    } else {
-      return result.value;
     }
   };
 
   WebPage.prototype.canGoBack = function() {
-    return this["native"].canGoBack;
+    return this["native"]().canGoBack;
   };
 
   WebPage.prototype.canGoForward = function() {
-    return this["native"].canGoForward;
+    return this["native"]().canGoForward;
   };
 
   return WebPage;