poltergeist 1.1.2 → 1.2.0

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

@@ -1,12 +1,10 @@
 var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
 Poltergeist.Connection = (function() {
-
   function Connection(owner, port) {
     this.owner = owner;
     this.port = port;
     this.commandReceived = __bind(this.commandReceived, this);
-
     this.socket = new WebSocket("ws://127.0.0.1:" + this.port + "/");
     this.socket.onmessage = this.commandReceived;
     this.socket.onclose = function() {

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

@@ -1,11 +1,11 @@
-var Poltergeist,
+var Poltergeist, _ref,
   __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; };
 
 Poltergeist = (function() {
-
   function Poltergeist(port, width, height) {
     var that;
+
     this.browser = new Poltergeist.Browser(this, width, height);
     this.connection = new Poltergeist.Connection(this, port);
     that = this;
@@ -16,10 +16,13 @@ Poltergeist = (function() {
   }
 
   Poltergeist.prototype.runCommand = function(command) {
+    var error;
+
     this.running = true;
     try {
       return this.browser[command.name].apply(this.browser, command.args);
-    } catch (error) {
+    } catch (_error) {
+      error = _error;
       if (error instanceof Poltergeist.Error) {
         return this.sendError(error);
       } else {
@@ -57,7 +60,6 @@ Poltergeist = (function() {
 window.Poltergeist = Poltergeist;
 
 Poltergeist.Error = (function() {
-
   function Error() {}
 
   return Error;
@@ -65,11 +67,11 @@ Poltergeist.Error = (function() {
 })();
 
 Poltergeist.ObsoleteNode = (function(_super) {
-
   __extends(ObsoleteNode, _super);
 
   function ObsoleteNode() {
-    return ObsoleteNode.__super__.constructor.apply(this, arguments);
+    _ref = ObsoleteNode.__super__.constructor.apply(this, arguments);
+    return _ref;
   }
 
   ObsoleteNode.prototype.name = "Poltergeist.ObsoleteNode";
@@ -86,27 +88,43 @@ Poltergeist.ObsoleteNode = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.ClickFailed = (function(_super) {
+Poltergeist.FrameNotFound = (function(_super) {
+  __extends(FrameNotFound, _super);
+
+  function FrameNotFound(frameName) {
+    this.frameName = frameName;
+  }
 
-  __extends(ClickFailed, _super);
+  FrameNotFound.prototype.name = "Poltergeist.FrameNotFound";
 
-  function ClickFailed(selector, position) {
+  FrameNotFound.prototype.args = function() {
+    return [this.frameName];
+  };
+
+  return FrameNotFound;
+
+})(Poltergeist.Error);
+
+Poltergeist.MouseEventFailed = (function(_super) {
+  __extends(MouseEventFailed, _super);
+
+  function MouseEventFailed(eventName, selector, position) {
+    this.eventName = eventName;
     this.selector = selector;
     this.position = position;
   }
 
-  ClickFailed.prototype.name = "Poltergeist.ClickFailed";
+  MouseEventFailed.prototype.name = "Poltergeist.MouseEventFailed";
 
-  ClickFailed.prototype.args = function() {
-    return [this.selector, this.position];
+  MouseEventFailed.prototype.args = function() {
+    return [this.eventName, this.selector, this.position];
   };
 
-  return ClickFailed;
+  return MouseEventFailed;
 
 })(Poltergeist.Error);
 
 Poltergeist.JavascriptError = (function(_super) {
-
   __extends(JavascriptError, _super);
 
   function JavascriptError(errors) {
@@ -124,7 +142,6 @@ Poltergeist.JavascriptError = (function(_super) {
 })(Poltergeist.Error);
 
 Poltergeist.BrowserError = (function(_super) {
-
   __extends(BrowserError, _super);
 
   function BrowserError(message, stack) {

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 = ['text', 'getAttribute', 'value', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest', 'scrollIntoView', 'isDOMEqual', 'focusAndHighlight', 'blur'];
+  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled'];
 
   function Node(page, id) {
     this.page = page;
@@ -19,6 +19,7 @@ Poltergeist.Node = (function() {
   _fn = function(name) {
     return Node.prototype[name] = function() {
       var args;
+
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       return this.page.nodeCall(this.id, name, args);
     };
@@ -28,8 +29,9 @@ Poltergeist.Node = (function() {
     _fn(name);
   }
 
-  Node.prototype.clickPosition = function() {
+  Node.prototype.mouseEventPosition = function() {
     var middle, pos, viewport;
+
     viewport = this.page.viewportSize();
     pos = this.position();
     middle = function(start, end, size) {
@@ -41,27 +43,26 @@ Poltergeist.Node = (function() {
     };
   };
 
-  Node.prototype.click = function(event) {
+  Node.prototype.mouseEvent = function(name) {
     var pos, test;
-    if (event == null) {
-      event = 'click';
-    }
+
     this.scrollIntoView();
-    pos = this.clickPosition();
-    test = this.clickTest(pos.x, pos.y);
+    pos = this.mouseEventPosition();
+    test = this.mouseEventTest(pos.x, pos.y);
     if (test.status === 'success') {
-      this.page.mouseEvent(event, pos.x, pos.y);
+      this.page.mouseEvent(name, pos.x, pos.y);
       return pos;
     } else {
-      throw new Poltergeist.ClickFailed(test.selector, pos);
+      throw new Poltergeist.MouseEventFailed(name, test.selector, pos);
     }
   };
 
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
+
     this.scrollIntoView();
-    position = this.clickPosition();
-    otherPosition = other.clickPosition();
+    position = this.mouseEventPosition();
+    otherPosition = other.mouseEventPosition();
     this.page.mouseEvent('mousedown', position.x, position.y);
     return this.page.mouseEvent('mouseup', otherPosition.x, otherPosition.y);
   };
@@ -70,13 +71,6 @@ Poltergeist.Node = (function() {
     return this.page === other.page && this.isDOMEqual(other.id);
   };
 
-  Node.prototype.set = function(value) {
-    this.focusAndHighlight();
-    this.page.sendEvent('keypress', 16777219);
-    this.page.sendEvent('keypress', value.toString());
-    return this.blur();
-  };
-
   return Node;
 
 }).call(this);

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

@@ -14,6 +14,7 @@ Poltergeist.WebPage = (function() {
 
   function WebPage(_native) {
     var callback, _i, _len, _ref;
+
     this["native"] = _native;
     this["native"] || (this["native"] = require('webpage').create());
     this._source = "";
@@ -32,6 +33,7 @@ Poltergeist.WebPage = (function() {
   _fn = function(command) {
     return WebPage.prototype[command] = function() {
       var args;
+
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       return this.runCommand(command, args);
     };
@@ -63,6 +65,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.injectAgent = function() {
     var extension, _k, _len2, _ref2, _results;
+
     if (this["native"].evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
@@ -103,6 +106,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onErrorNative = function(message, stack) {
     var stackString;
+
     stackString = message;
     stack.forEach(function(frame) {
       stackString += "\n";
@@ -131,6 +135,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
     var _ref2;
+
     if ((_ref2 = this._networkTraffic[response.id]) != null) {
       _ref2.responseParts.push(response);
     }
@@ -156,6 +161,10 @@ Poltergeist.WebPage = (function() {
     return this._source;
   };
 
+  WebPage.prototype.title = function() {
+    return this["native"].frameTitle;
+  };
+
   WebPage.prototype.errors = function() {
     return this._errors;
   };
@@ -170,6 +179,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.responseHeaders = function() {
     var headers;
+
     headers = {};
     this._responseHeaders.forEach(function(item) {
       return headers[item.name] = item.value;
@@ -228,15 +238,12 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.popFrame = function() {
     this.frames.pop();
-    if (this.frames.length === 0) {
-      return this["native"].switchToMainFrame();
-    } else {
-      return this["native"].switchToFrame(this.frames[this.frames.length - 1]);
-    }
+    return this["native"].switchToParentFrame();
   };
 
   WebPage.prototype.getPage = function(name) {
     var page;
+
     if (this.sub_pages[name]) {
       return this.sub_pages[name];
     } else {
@@ -249,6 +256,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.dimensions = function() {
     var scroll, viewport;
+
     scroll = this.scrollPosition();
     viewport = this.viewportSize();
     return {
@@ -263,6 +271,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.validatedDimensions = function() {
     var dimensions, document;
+
     dimensions = this.dimensions();
     document = dimensions.document;
     if (dimensions.right > document.width) {
@@ -291,6 +300,7 @@ Poltergeist.WebPage = (function() {
 
   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)) + ") }"));
@@ -298,6 +308,7 @@ Poltergeist.WebPage = (function() {
 
   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)) + " }");
   };
@@ -312,9 +323,11 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.bindCallback = function(name) {
     var that;
+
     that = this;
     return this["native"][name] = function() {
       var result;
+
       if (that[name + 'Native'] != null) {
         result = that[name + 'Native'].apply(that, arguments);
       }
@@ -326,6 +339,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.runCommand = function(name, args) {
     var result;
+
     result = this.evaluate(function(name, args) {
       return __poltergeist.externalCall(name, args);
     }, name, args);

data/lib/capybara/poltergeist/client/main.coffee

@@ -50,10 +50,15 @@ class Poltergeist.ObsoleteNode extends Poltergeist.Error
   args: -> []
   toString: -> this.name
 
-class Poltergeist.ClickFailed extends Poltergeist.Error
-  constructor: (@selector, @position) ->
-  name: "Poltergeist.ClickFailed"
-  args: -> [@selector, @position]
+class Poltergeist.FrameNotFound extends Poltergeist.Error
+  constructor: (@frameName) ->
+  name: "Poltergeist.FrameNotFound"
+  args: -> [@frameName]
+
+class Poltergeist.MouseEventFailed extends Poltergeist.Error
+  constructor: (@eventName, @selector, @position) ->
+  name: "Poltergeist.MouseEventFailed"
+  args: -> [@eventName, @selector, @position]
 
 class Poltergeist.JavascriptError extends Poltergeist.Error
   constructor: (@errors) ->

data/lib/capybara/poltergeist/client/node.coffee

@@ -1,10 +1,10 @@
 # Proxy object for forwarding method calls to the node object inside the page.
 
 class Poltergeist.Node
-  @DELEGATES = ['text', 'getAttribute', 'value', 'setAttribute', 'isObsolete',
+  @DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete',
                 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find',
-                'isVisible', 'position', 'trigger', 'parentId', 'clickTest',
-                'scrollIntoView', 'isDOMEqual', 'focusAndHighlight', 'blur']
+                'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest',
+                'scrollIntoView', 'isDOMEqual', 'isDisabled']
 
   constructor: (@page, @id) ->
 
@@ -16,7 +16,7 @@ class Poltergeist.Node
       this.prototype[name] = (args...) ->
         @page.nodeCall(@id, name, args)
 
-  clickPosition: ->
+  mouseEventPosition: ->
     viewport = @page.viewportSize()
     pos      = this.position()
 
@@ -28,34 +28,26 @@ class Poltergeist.Node
       y: middle(pos.top,  pos.bottom, viewport.height)
     }
 
-  click: (event = 'click') ->
+  mouseEvent: (name) ->
     this.scrollIntoView()
 
-    pos  = this.clickPosition()
-    test = this.clickTest(pos.x, pos.y)
+    pos  = this.mouseEventPosition()
+    test = this.mouseEventTest(pos.x, pos.y)
 
     if test.status == 'success'
-      @page.mouseEvent(event, pos.x, pos.y)
+      @page.mouseEvent(name, pos.x, pos.y)
       pos
     else
-      throw new Poltergeist.ClickFailed(test.selector, pos)
+      throw new Poltergeist.MouseEventFailed(name, test.selector, pos)
 
   dragTo: (other) ->
     this.scrollIntoView()
 
-    position      = this.clickPosition()
-    otherPosition = other.clickPosition()
+    position      = this.mouseEventPosition()
+    otherPosition = other.mouseEventPosition()
 
     @page.mouseEvent('mousedown', position.x,      position.y)
     @page.mouseEvent('mouseup',   otherPosition.x, otherPosition.y)
 
   isEqual: (other) ->
     @page == other.page && this.isDOMEqual(other.id)
-
-  set: (value) ->
-    this.focusAndHighlight()
-    # Sending backspace to clear the input
-    # keycode from: https://github.com/ariya/phantomjs/commit/cab2635e66d74b7e665c44400b8b20a8f225153a#L0R370
-    @page.sendEvent('keypress', 16777219)
-    @page.sendEvent('keypress', value.toString())
-    this.blur()

data/lib/capybara/poltergeist/client/web_page.coffee

@@ -101,6 +101,9 @@ class Poltergeist.WebPage
   source: ->
     @_source
 
+  title: ->
+    @native.frameTitle
+
   errors: ->
     @_errors
 
@@ -155,11 +158,7 @@ class Poltergeist.WebPage
 
   popFrame: ->
     @frames.pop()
-
-    if @frames.length == 0
-      @native.switchToMainFrame()
-    else
-      @native.switchToFrame(@frames[@frames.length - 1])
+    @native.switchToParentFrame()
 
   getPage: (name) ->
     if @sub_pages[name]

data/lib/capybara/poltergeist/driver.rb

@@ -106,8 +106,20 @@ module Capybara::Poltergeist
       browser.source.to_s
     end
 
-    def find(selector)
-      browser.find(selector).map { |page_id, id| Capybara::Poltergeist::Node.new(self, page_id, id) }
+    def title
+      browser.title
+    end
+
+    def find(method, selector)
+      browser.find(method, selector).map { |page_id, id| Capybara::Poltergeist::Node.new(self, page_id, id) }
+    end
+
+    def find_xpath(selector)
+      find :xpath, selector
+    end
+
+    def find_css(selector)
+      find :css, selector
     end
 
     def click(x, y)
@@ -199,7 +211,7 @@ module Capybara::Poltergeist
     end
 
     def invalid_element_errors
-      [Capybara::Poltergeist::ObsoleteNode, Capybara::Poltergeist::ClickFailed]
+      [Capybara::Poltergeist::ObsoleteNode, Capybara::Poltergeist::MouseEventFailed]
     end
   end
 end