poltergeist 1.5.0 → 1.6.0

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

@@ -1,67 +1,53 @@
+var __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.Browser = (function() {
   function Browser(owner, width, height) {
     this.owner = owner;
     this.width = width || 1024;
     this.height = height || 768;
-    this.state = 'default';
-    this.page_stack = [];
-    this.page_id = 0;
+    this.pages = [];
     this.js_errors = true;
     this._debug = false;
+    this._counter = 0;
     this.resetPage();
   }
 
   Browser.prototype.resetPage = function() {
-    var _this = this;
+    var _ref,
+      _this = this;
+    _ref = [0, []], this._counter = _ref[0], this.pages = _ref[1];
     if (this.page != null) {
-      this.page.release();
+      if (!this.page.closed) {
+        if (this.page.currentUrl() !== 'about:blank') {
+          this.page.clearLocalStorage();
+        }
+        this.page.release();
+      }
       phantom.clearCookies();
     }
-    this.page = new Poltergeist.WebPage;
+    this.page = this.currentPage = new Poltergeist.WebPage;
     this.page.setViewportSize({
       width: this.width,
       height: this.height
     });
-    this.page.onLoadStarted = function() {
-      if (_this.state === 'mouse_event') {
-        return _this.setState('loading');
-      }
-    };
-    this.page.onNavigationRequested = function(url, navigation) {
-      if (_this.state === 'mouse_event' && navigation === 'FormSubmitted') {
-        return _this.setState('loading');
-      }
-    };
-    this.page.onLoadFinished = function(status) {
-      if (_this.state === 'loading') {
-        _this.sendResponse({
-          status: status,
-          position: _this.last_mouse_event
-        });
-        return _this.setState('default');
-      } else if (_this.state === 'awaiting_frame_load') {
-        _this.sendResponse(true);
-        return _this.setState('default');
-      }
-    };
-    this.page.onInitialized = function() {
-      return _this.page_id += 1;
-    };
-    return this.page.onPageCreated = function(sub_page) {
-      var name;
-      if (_this.state === 'awaiting_sub_page') {
-        name = _this.page_name;
-        _this.page_name = null;
-        _this.setState('default');
-        return setTimeout((function() {
-          return _this.push_window(name);
-        }), 0);
-      }
+    this.page.handle = "" + (this._counter++);
+    this.pages.push(this.page);
+    return this.page.onPageCreated = function(newPage) {
+      var page;
+      page = new Poltergeist.WebPage(newPage);
+      page.handle = "" + (_this._counter++);
+      return _this.pages.push(page);
     };
   };
 
+  Browser.prototype.getPageByHandle = function(handle) {
+    return this.pages.filter(function(p) {
+      return !p.closed && p.handle === handle;
+    })[0];
+  };
+
   Browser.prototype.runCommand = function(name, args) {
-    this.setState("default");
+    this.currentPage.state = 'default';
     return this[name].apply(this, args);
   };
 
@@ -71,18 +57,10 @@ Poltergeist.Browser = (function() {
     }
   };
 
-  Browser.prototype.setState = function(state) {
-    if (this.state === state) {
-      return;
-    }
-    this.debug("state " + this.state + " -> " + state);
-    return this.state = state;
-  };
-
   Browser.prototype.sendResponse = function(response) {
     var errors;
-    errors = this.page.errors();
-    this.page.clearErrors();
+    errors = this.currentPage.errors;
+    this.currentPage.clearErrors();
     if (errors.length > 0 && this.js_errors) {
       return this.owner.sendError(new Poltergeist.JavascriptError(errors));
     } else {
@@ -91,53 +69,66 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.add_extension = function(extension) {
-    this.page.injectExtension(extension);
+    this.currentPage.injectExtension(extension);
     return this.sendResponse('success');
   };
 
   Browser.prototype.node = function(page_id, id) {
-    if (page_id === this.page_id) {
-      return this.page.get(id);
+    if (this.currentPage.id === page_id) {
+      return this.currentPage.get(id);
     } else {
       throw new Poltergeist.ObsoleteNode;
     }
   };
 
   Browser.prototype.visit = function(url) {
-    var prev_url;
-    this.setState('loading');
-    prev_url = this.page.source() === null ? 'about:blank' : this.page.currentUrl();
-    this.page.open(url);
-    if (/#/.test(url) && prev_url.split('#')[0] === url.split('#')[0]) {
-      this.setState('default');
-      return this.sendResponse('success');
+    var prevUrl,
+      _this = this;
+    this.currentPage.state = 'loading';
+    prevUrl = this.currentPage.source === null ? 'about:blank' : this.currentPage.currentUrl();
+    this.currentPage.open(url);
+    if (/#/.test(url) && prevUrl.split('#')[0] === url.split('#')[0]) {
+      this.currentPage.state = 'default';
+      return this.sendResponse({
+        status: 'success'
+      });
+    } else {
+      return this.currentPage.waitState('default', function() {
+        if (_this.currentPage.statusCode === null && _this.currentPage.status === 'fail') {
+          return _this.owner.sendError(new Poltergeist.StatusFailError);
+        } else {
+          return _this.sendResponse({
+            status: _this.currentPage.status
+          });
+        }
+      });
     }
   };
 
   Browser.prototype.current_url = function() {
-    return this.sendResponse(this.page.currentUrl());
+    return this.sendResponse(this.currentPage.currentUrl());
   };
 
   Browser.prototype.status_code = function() {
-    return this.sendResponse(this.page.statusCode());
+    return this.sendResponse(this.currentPage.statusCode);
   };
 
   Browser.prototype.body = function() {
-    return this.sendResponse(this.page.content());
+    return this.sendResponse(this.currentPage.content());
   };
 
   Browser.prototype.source = function() {
-    return this.sendResponse(this.page.source());
+    return this.sendResponse(this.currentPage.source);
   };
 
   Browser.prototype.title = function() {
-    return this.sendResponse(this.page.title());
+    return this.sendResponse(this.currentPage.title());
   };
 
   Browser.prototype.find = function(method, selector) {
     return this.sendResponse({
-      page_id: this.page_id,
-      ids: this.page.find(method, selector)
+      page_id: this.currentPage.id,
+      ids: this.currentPage.find(method, selector)
     });
   };
 
@@ -161,6 +152,14 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(this.node(page_id, id).getAttribute(name));
   };
 
+  Browser.prototype.attributes = function(page_id, id, name) {
+    return this.sendResponse(this.node(page_id, id).getAttributes());
+  };
+
+  Browser.prototype.parents = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).parentIds());
+  };
+
   Browser.prototype.value = function(page_id, id) {
     return this.sendResponse(this.node(page_id, id).value());
   };
@@ -173,9 +172,9 @@ Poltergeist.Browser = (function() {
   Browser.prototype.select_file = function(page_id, id, value) {
     var node;
     node = this.node(page_id, id);
-    this.page.beforeUpload(node.id);
-    this.page.uploadFile('[_poltergeist_selected]', value);
-    this.page.afterUpload(node.id);
+    this.currentPage.beforeUpload(node.id);
+    this.currentPage.uploadFile('[_poltergeist_selected]', value);
+    this.currentPage.afterUpload(node.id);
     return this.sendResponse(true);
   };
 
@@ -196,22 +195,32 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.evaluate = function(script) {
-    return this.sendResponse(this.page.evaluate("function() { return " + script + " }"));
+    return this.sendResponse(this.currentPage.evaluate("function() { return " + script + " }"));
   };
 
   Browser.prototype.execute = function(script) {
-    this.page.execute("function() { " + script + " }");
+    this.currentPage.execute("function() { " + script + " }");
     return this.sendResponse(true);
   };
 
+  Browser.prototype.frameUrl = function(frame_name) {
+    return this.currentPage.frameUrl(frame_name);
+  };
+
   Browser.prototype.push_frame = function(name, timeout) {
-    var _this = this;
+    var _ref,
+      _this = this;
     if (timeout == null) {
       timeout = new Date().getTime() + 2000;
     }
-    if (this.page.pushFrame(name)) {
-      if (this.page.currentUrl() === 'about:blank') {
-        return this.setState('awaiting_frame_load');
+    if (_ref = this.frameUrl(name), __indexOf.call(this.currentPage.blockedUrls(), _ref) >= 0) {
+      return this.sendResponse(true);
+    } else if (this.currentPage.pushFrame(name)) {
+      if (this.currentPage.currentUrl() === 'about:blank') {
+        this.currentPage.state = 'awaiting_frame_load';
+        return this.currentPage.waitState('default', function() {
+          return _this.sendResponse(true);
+        });
       } else {
         return this.sendResponse(true);
       }
@@ -226,55 +235,83 @@ Poltergeist.Browser = (function() {
     }
   };
 
-  Browser.prototype.pages = function() {
-    return this.sendResponse(this.page.pages());
+  Browser.prototype.pop_frame = function() {
+    return this.sendResponse(this.currentPage.popFrame());
+  };
+
+  Browser.prototype.window_handles = function() {
+    var handles;
+    handles = this.pages.filter(function(p) {
+      return !p.closed;
+    }).map(function(p) {
+      return p.handle;
+    });
+    return this.sendResponse(handles);
   };
 
-  Browser.prototype.pop_frame = function() {
-    return this.sendResponse(this.page.popFrame());
+  Browser.prototype.window_handle = function(name) {
+    var handle, page;
+    if (name == null) {
+      name = null;
+    }
+    handle = name ? (page = this.pages.filter(function(p) {
+      return !p.closed && p.windowName() === name;
+    })[0], page ? page.handle : null) : this.currentPage.handle;
+    return this.sendResponse(handle);
   };
 
-  Browser.prototype.push_window = function(name) {
-    var sub_page,
+  Browser.prototype.switch_to_window = function(handle) {
+    var page,
       _this = this;
-    sub_page = this.page.getPage(name);
-    if (sub_page) {
-      if (sub_page.currentUrl() === 'about:blank') {
-        return sub_page.onLoadFinished = function() {
-          sub_page.onLoadFinished = null;
-          return _this.push_window(name);
-        };
+    page = this.getPageByHandle(handle);
+    if (page) {
+      if (page !== this.currentPage) {
+        return page.waitState('default', function() {
+          _this.currentPage = page;
+          return _this.sendResponse(true);
+        });
       } else {
-        this.page_stack.push(this.page);
-        this.page = sub_page;
-        this.page_id += 1;
         return this.sendResponse(true);
       }
     } else {
-      this.page_name = name;
-      return this.setState('awaiting_sub_page');
+      throw new Poltergeist.NoSuchWindowError;
     }
   };
 
-  Browser.prototype.pop_window = function() {
-    var prev_page;
-    prev_page = this.page_stack.pop();
-    if (prev_page) {
-      this.page = prev_page;
-    }
+  Browser.prototype.open_new_window = function() {
+    this.execute('window.open()');
     return this.sendResponse(true);
   };
 
+  Browser.prototype.close_window = function(handle) {
+    var page;
+    page = this.getPageByHandle(handle);
+    if (page) {
+      page.release();
+      return this.sendResponse(true);
+    } else {
+      return this.sendResponse(false);
+    }
+  };
+
   Browser.prototype.mouse_event = function(page_id, id, name) {
     var node,
       _this = this;
     node = this.node(page_id, id);
-    this.setState('mouse_event');
+    this.currentPage.state = 'mouse_event';
     this.last_mouse_event = node.mouseEvent(name);
     return setTimeout(function() {
-      if (_this.state !== 'loading') {
-        _this.setState('default');
-        return _this.sendResponse(_this.last_mouse_event);
+      if (_this.currentPage.state === 'mouse_event') {
+        _this.currentPage.state = 'default';
+        return _this.sendResponse({
+          position: _this.last_mouse_event
+        });
+      } else {
+        return _this.currentPage.waitState('default', function() {
+          return _this.sendResponse({
+            position: _this.last_mouse_event
+          });
+        });
       }
     }, 5);
   };
@@ -283,6 +320,10 @@ Poltergeist.Browser = (function() {
     return this.mouse_event(page_id, id, 'click');
   };
 
+  Browser.prototype.right_click = function(page_id, id) {
+    return this.mouse_event(page_id, id, 'rightclick');
+  };
+
   Browser.prototype.double_click = function(page_id, id) {
     return this.mouse_event(page_id, id, 'doubleclick');
   };
@@ -292,7 +333,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.click_coordinates = function(x, y) {
-    this.page.sendEvent('click', x, y);
+    this.currentPage.sendEvent('click', x, y);
     return this.sendResponse({
       click: {
         x: x,
@@ -321,7 +362,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.scroll_to = function(left, top) {
-    this.page.setScrollPosition({
+    this.currentPage.setScrollPosition({
       left: left,
       top: top
     });
@@ -329,12 +370,15 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.send_keys = function(page_id, id, keys) {
-    var key, sequence, _i, _len;
-    this.node(page_id, id).mouseEvent('click');
+    var key, sequence, target, _i, _len;
+    target = this.node(page_id, id);
+    if (!target.containsSelection()) {
+      target.mouseEvent('click');
+    }
     for (_i = 0, _len = keys.length; _i < _len; _i++) {
       sequence = keys[_i];
-      key = sequence.key != null ? this.page["native"].event.key[sequence.key] : sequence;
-      this.page.sendEvent('keypress', key);
+      key = sequence.key != null ? this.currentPage.keyCode(sequence.key) : sequence;
+      this.currentPage.sendEvent('keypress', key);
     }
     return this.sendResponse(true);
   };
@@ -345,7 +389,7 @@ Poltergeist.Browser = (function() {
       selector = null;
     }
     this.set_clip_rect(full, selector);
-    encoded_image = this.page.renderBase64(format);
+    encoded_image = this.currentPage.renderBase64(format);
     return this.sendResponse(encoded_image);
   };
 
@@ -355,12 +399,12 @@ Poltergeist.Browser = (function() {
       selector = null;
     }
     dimensions = this.set_clip_rect(full, selector);
-    this.page.setScrollPosition({
+    this.currentPage.setScrollPosition({
       left: 0,
       top: 0
     });
-    this.page.render(path);
-    this.page.setScrollPosition({
+    this.currentPage.render(path);
+    this.currentPage.setScrollPosition({
       left: dimensions.left,
       top: dimensions.top
     });
@@ -369,30 +413,35 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.set_clip_rect = function(full, selector) {
     var dimensions, document, rect, viewport, _ref;
-    dimensions = this.page.validatedDimensions();
+    dimensions = this.currentPage.validatedDimensions();
     _ref = [dimensions.document, dimensions.viewport], document = _ref[0], viewport = _ref[1];
     rect = full ? {
       left: 0,
       top: 0,
       width: document.width,
       height: document.height
-    } : selector != null ? this.page.elementBounds(selector) : {
+    } : selector != null ? this.currentPage.elementBounds(selector) : {
       left: 0,
       top: 0,
       width: viewport.width,
       height: viewport.height
     };
-    this.page.setClipRect(rect);
+    this.currentPage.setClipRect(rect);
     return dimensions;
   };
 
   Browser.prototype.set_paper_size = function(size) {
-    this.page.setPaperSize(size);
+    this.currentPage.setPaperSize(size);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.set_zoom_factor = function(zoom_factor) {
+    this.currentPage.setZoomFactor(zoom_factor);
     return this.sendResponse(true);
   };
 
   Browser.prototype.resize = function(width, height) {
-    this.page.setViewportSize({
+    this.currentPage.setViewportSize({
       width: width,
       height: height
     });
@@ -400,29 +449,29 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.network_traffic = function() {
-    return this.sendResponse(this.page.networkTraffic());
+    return this.sendResponse(this.currentPage.networkTraffic());
   };
 
   Browser.prototype.clear_network_traffic = function() {
-    this.page.clearNetworkTraffic();
+    this.currentPage.clearNetworkTraffic();
     return this.sendResponse(true);
   };
 
   Browser.prototype.get_headers = function() {
-    return this.sendResponse(this.page.getCustomHeaders());
+    return this.sendResponse(this.currentPage.getCustomHeaders());
   };
 
   Browser.prototype.set_headers = function(headers) {
     if (headers['User-Agent']) {
-      this.page.setUserAgent(headers['User-Agent']);
+      this.currentPage.setUserAgent(headers['User-Agent']);
     }
-    this.page.setCustomHeaders(headers);
+    this.currentPage.setCustomHeaders(headers);
     return this.sendResponse(true);
   };
 
   Browser.prototype.add_headers = function(headers) {
     var allHeaders, name, value;
-    allHeaders = this.page.getCustomHeaders();
+    allHeaders = this.currentPage.getCustomHeaders();
     for (name in headers) {
       value = headers[name];
       allHeaders[name] = value;
@@ -432,17 +481,17 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.add_header = function(header, permanent) {
     if (!permanent) {
-      this.page.addTempHeader(header);
+      this.currentPage.addTempHeader(header);
     }
     return this.add_headers(header);
   };
 
   Browser.prototype.response_headers = function() {
-    return this.sendResponse(this.page.responseHeaders());
+    return this.sendResponse(this.currentPage.responseHeaders());
   };
 
   Browser.prototype.cookies = function() {
-    return this.sendResponse(this.page.cookies());
+    return this.sendResponse(this.currentPage.cookies());
   };
 
   Browser.prototype.set_cookie = function(cookie) {
@@ -451,7 +500,12 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.remove_cookie = function(name) {
-    this.page.deleteCookie(name);
+    this.currentPage.deleteCookie(name);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.clear_cookies = function() {
+    phantom.clearCookies();
     return this.sendResponse(true);
   };
 
@@ -461,7 +515,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.set_http_auth = function(user, password) {
-    this.page.setHttpAuth(user, password);
+    this.currentPage.setHttpAuth(user, password);
     return this.sendResponse(true);
   };
 
@@ -486,16 +540,33 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.go_back = function() {
-    if (this.page.canGoBack) {
-      this.page.goBack();
+    var _this = this;
+    if (this.currentPage.canGoBack) {
+      this.currentPage.state = 'loading';
+      this.currentPage.goBack();
+      return this.currentPage.waitState('default', function() {
+        return _this.sendResponse(true);
+      });
+    } else {
+      return this.sendResponse(false);
     }
-    return this.sendResponse(true);
   };
 
   Browser.prototype.go_forward = function() {
-    if (this.page.canGoForward) {
-      this.page.goForward();
+    var _this = this;
+    if (this.currentPage.canGoForward) {
+      this.currentPage.state = 'loading';
+      this.currentPage.goForward();
+      return this.currentPage.waitState('default', function() {
+        return _this.sendResponse(true);
+      });
+    } else {
+      return this.sendResponse(false);
     }
+  };
+
+  Browser.prototype.set_url_blacklist = function() {
+    this.currentPage.urlBlacklist = Array.prototype.slice.call(arguments);
     return this.sendResponse(true);
   };
 

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);