poltergeist 0.7.0 → 1.0.0

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

@@ -6,6 +6,7 @@ Poltergeist.Browser = (function() {
     this.width = width || 1024;
     this.height = height || 768;
     this.state = 'default';
+    this.page_stack = [];
     this.page_id = 0;
     this.resetPage();
   }
@@ -14,8 +15,13 @@ Poltergeist.Browser = (function() {
     var _this = this;
     if (this.page != null) {
       this.page.release();
+      phantom.clearCookies();
     }
-    this.page = new Poltergeist.WebPage(this.width, this.height);
+    this.page = new Poltergeist.WebPage;
+    this.page.setViewportSize({
+      width: this.width,
+      height: this.height
+    });
     this.page.onLoadStarted = function() {
       if (_this.state === 'clicked') {
         return _this.state = 'loading';
@@ -28,13 +34,30 @@ Poltergeist.Browser = (function() {
     };
     this.page.onLoadFinished = function(status) {
       if (_this.state === 'loading') {
-        _this.sendResponse(status);
+        _this.sendResponse({
+          status: status,
+          click: _this.last_click
+        });
+        return _this.state = 'default';
+      } else if (_this.state === 'awaiting_frame_load') {
+        _this.sendResponse(true);
         return _this.state = 'default';
       }
     };
-    return this.page.onInitialized = function() {
+    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.state = 'default';
+        _this.page_name = null;
+        return setTimeout((function() {
+          return _this.push_window(name);
+        }), 0);
+      }
+    };
   };
 
   Browser.prototype.sendResponse = function(response) {
@@ -42,7 +65,7 @@ Poltergeist.Browser = (function() {
     errors = this.page.errors();
     if (errors.length > 0) {
       this.page.clearErrors();
-      throw new Poltergeist.JavascriptError(errors);
+      return this.owner.sendError(new Poltergeist.JavascriptError(errors));
     } else {
       return this.owner.sendResponse(response);
     }
@@ -56,12 +79,15 @@ Poltergeist.Browser = (function() {
     }
   };
 
-  Browser.prototype.visit = function(url, headers) {
+  Browser.prototype.visit = function(url) {
+    var prev_url;
     this.state = 'loading';
-    return this.page.open(url, {
-      operation: "get",
-      headers: headers
-    });
+    prev_url = this.page.currentUrl();
+    this.page.open(url);
+    if (/#/.test(url) && prev_url.split('#')[0] === url.split('#')[0]) {
+      this.state = 'default';
+      return this.sendResponse('success');
+    }
   };
 
   Browser.prototype.current_url = function() {
@@ -138,25 +164,68 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
-  Browser.prototype.push_frame = function(id) {
-    this.page.pushFrame(id);
-    return this.sendResponse(true);
+  Browser.prototype.push_frame = function(name) {
+    var _this = this;
+    if (this.page.pushFrame(name)) {
+      if (this.page.currentUrl() === 'about:blank') {
+        return this.state = 'awaiting_frame_load';
+      } else {
+        return this.sendResponse(true);
+      }
+    } else {
+      return setTimeout((function() {
+        return _this.push_frame(name);
+      }), 50);
+    }
   };
 
   Browser.prototype.pop_frame = function() {
-    this.page.popFrame();
+    return this.sendResponse(this.page.popFrame());
+  };
+
+  Browser.prototype.push_window = function(name) {
+    var sub_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);
+        };
+      } 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.state = 'awaiting_sub_page';
+    }
+  };
+
+  Browser.prototype.pop_window = function() {
+    var prev_page;
+    prev_page = this.page_stack.pop();
+    if (prev_page) {
+      this.page = prev_page;
+    }
     return this.sendResponse(true);
   };
 
   Browser.prototype.click = function(page_id, id) {
-    var node;
+    var node,
+      _this = this;
     node = this.node(page_id, id);
     this.state = 'clicked';
-    node.click();
-    if (this.state !== 'loading') {
-      this.state = 'default';
-      return this.sendResponse(true);
-    }
+    this.last_click = node.click();
+    return setTimeout(function() {
+      if (_this.state !== 'loading') {
+        _this.state = 'default';
+        return _this.sendResponse(_this.last_click);
+      }
+    }, 5);
   };
 
   Browser.prototype.drag = function(page_id, id, other_id) {
@@ -223,6 +292,32 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(this.page.networkTraffic());
   };
 
+  Browser.prototype.set_headers = function(headers) {
+    if (headers['User-Agent']) {
+      this.page.setUserAgent(headers['User-Agent']);
+    }
+    this.page.setCustomHeaders(headers);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.response_headers = function() {
+    return this.sendResponse(this.page.responseHeaders());
+  };
+
+  Browser.prototype.cookies = function() {
+    return this.sendResponse(this.page.cookies());
+  };
+
+  Browser.prototype.set_cookie = function(cookie) {
+    phantom.addCookie(cookie);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.remove_cookie = function(name) {
+    this.page.deleteCookie(name);
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.exit = function() {
     return phantom.exit();
   };

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', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest', 'scrollIntoView', 'isDOMEqual'];
+  Node.DELEGATES = ['text', 'getAttribute', 'value', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest', 'scrollIntoView', 'isDOMEqual', 'focusAndHighlight', 'blur'];
 
   function Node(page, id) {
     this.page = page;
@@ -47,7 +47,8 @@ Poltergeist.Node = (function() {
     pos = this.clickPosition();
     test = this.clickTest(pos.x, pos.y);
     if (test.status === 'success') {
-      return this.page.sendEvent('click', pos.x, pos.y);
+      this.page.mouseEvent('click', pos.x, pos.y);
+      return pos;
     } else {
       throw new Poltergeist.ClickFailed(test.selector, pos);
     }
@@ -58,15 +59,20 @@ Poltergeist.Node = (function() {
     this.scrollIntoView();
     position = this.clickPosition();
     otherPosition = other.clickPosition();
-    this.page.sendEvent('mousedown', position.x, position.y);
-    this.page.sendEvent('mousemove', otherPosition.x, otherPosition.y);
-    return this.page.sendEvent('mouseup', otherPosition.x, otherPosition.y);
+    this.page.mouseEvent('mousedown', position.x, position.y);
+    return this.page.mouseEvent('mouseup', otherPosition.x, otherPosition.y);
   };
 
   Node.prototype.isEqual = function(other) {
     return this.page === other.page && this.isDOMEqual(other.id);
   };
 
+  Node.prototype.set = function(value) {
+    this.focusAndHighlight();
+    this.page.sendEvent('keypress', value.toString());
+    return this.blur();
+  };
+
   return Node;
 
 }).call(this);

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

@@ -4,22 +4,21 @@ 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'];
+  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated'];
 
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render'];
 
-  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'pushFrame', 'popFrame', 'documentSize'];
+  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize'];
 
-  function WebPage(width, height) {
+  function WebPage(_native) {
     var callback, _i, _len, _ref;
-    this["native"] = require('webpage').create();
+    this["native"] = _native;
+    this["native"] || (this["native"] = require('webpage').create());
     this._source = "";
     this._errors = [];
     this._networkTraffic = {};
-    this.setViewportSize({
-      width: width,
-      height: height
-    });
+    this.frames = [];
+    this.sub_pages = {};
     _ref = WebPage.CALLBACKS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       callback = _ref[_i];
@@ -65,8 +64,7 @@ Poltergeist.WebPage = (function() {
     if (this["native"].evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
-      this["native"].injectJs("" + phantom.libraryPath + "/agent.js");
-      return this.nodes = {};
+      return this["native"].injectJs("" + phantom.libraryPath + "/agent.js");
     }
   };
 
@@ -107,6 +105,10 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onResourceRequestedNative = function(request) {
     this.lastRequestId = request.id;
+    if (request.url === this.redirectURL) {
+      this.redirectURL = null;
+      this.requestId = request.id;
+    }
     return this._networkTraffic[request.id] = {
       request: request,
       responseParts: []
@@ -114,12 +116,16 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
-    this._networkTraffic[response.id].responseParts.push(response);
+    var _ref2;
+    if ((_ref2 = this._networkTraffic[response.id]) != null) {
+      _ref2.responseParts.push(response);
+    }
     if (this.requestId === response.id) {
       if (response.redirectURL) {
-        return this.requestId = response.id;
+        return this.redirectURL = response.redirectURL;
       } else {
-        return this._statusCode = response.status;
+        this._statusCode = response.status;
+        return this._responseHeaders = response.headers;
       }
     }
   };
@@ -129,7 +135,7 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.content = function() {
-    return this["native"].content;
+    return this["native"].frameContent;
   };
 
   WebPage.prototype.source = function() {
@@ -148,6 +154,23 @@ Poltergeist.WebPage = (function() {
     return this._statusCode;
   };
 
+  WebPage.prototype.responseHeaders = function() {
+    var headers;
+    headers = {};
+    this._responseHeaders.forEach(function(item) {
+      return headers[item.name] = item.value;
+    });
+    return headers;
+  };
+
+  WebPage.prototype.cookies = function() {
+    return this["native"].cookies;
+  };
+
+  WebPage.prototype.deleteCookie = function(name) {
+    return this["native"].deleteCookie(name);
+  };
+
   WebPage.prototype.viewportSize = function() {
     return this["native"].viewportSize;
   };
@@ -172,6 +195,43 @@ Poltergeist.WebPage = (function() {
     return this["native"].clipRect = rect;
   };
 
+  WebPage.prototype.setUserAgent = function(userAgent) {
+    return this["native"].settings.userAgent = userAgent;
+  };
+
+  WebPage.prototype.setCustomHeaders = function(headers) {
+    return this["native"].customHeaders = headers;
+  };
+
+  WebPage.prototype.pushFrame = function(name) {
+    var res;
+    this.frames.push(name);
+    res = this["native"].switchToFrame(name);
+    this.injectAgent();
+    return res;
+  };
+
+  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]);
+    }
+  };
+
+  WebPage.prototype.getPage = function(name) {
+    var page;
+    if (this.sub_pages[name]) {
+      return this.sub_pages[name];
+    } else {
+      page = this["native"].getPage(name);
+      if (page) {
+        return this.sub_pages[name] = new Poltergeist.WebPage(page);
+      }
+    }
+  };
+
   WebPage.prototype.dimensions = function() {
     var scroll, viewport;
     scroll = this.scrollPosition();
@@ -206,8 +266,12 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.get = function(id) {
-    var _base;
-    return (_base = this.nodes)[id] || (_base[id] = new Poltergeist.Node(this, id));
+    return new Poltergeist.Node(this, id);
+  };
+
+  WebPage.prototype.mouseEvent = function(name, x, y) {
+    this.sendEvent('mousemove', x, y);
+    return this.sendEvent(name, x, y);
   };
 
   WebPage.prototype.evaluate = function() {

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', 'set', 'setAttribute', 'isObsolete',
+  @DELEGATES = ['text', 'getAttribute', 'value', 'setAttribute', 'isObsolete',
                 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find',
                 'isVisible', 'position', 'trigger', 'parentId', 'clickTest',
-                'scrollIntoView', 'isDOMEqual']
+                'scrollIntoView', 'isDOMEqual', 'focusAndHighlight', 'blur']
 
   constructor: (@page, @id) ->
 
@@ -35,7 +35,8 @@ class Poltergeist.Node
     test = this.clickTest(pos.x, pos.y)
 
     if test.status == 'success'
-      @page.sendEvent('click', pos.x, pos.y)
+      @page.mouseEvent('click', pos.x, pos.y)
+      pos
     else
       throw new Poltergeist.ClickFailed(test.selector, pos)
 
@@ -45,9 +46,13 @@ class Poltergeist.Node
     position      = this.clickPosition()
     otherPosition = other.clickPosition()
 
-    @page.sendEvent('mousedown', position.x,      position.y)
-    @page.sendEvent('mousemove', otherPosition.x, otherPosition.y)
-    @page.sendEvent('mouseup',   otherPosition.x, otherPosition.y)
+    @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()
+    @page.sendEvent('keypress', value.toString())
+    this.blur()

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

@@ -1,19 +1,20 @@
 class Poltergeist.WebPage
   @CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized',
                 'onLoadStarted', 'onResourceRequested', 'onResourceReceived',
-                'onError', 'onNavigationRequested', 'onUrlChanged']
+                'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated']
 
   @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render']
 
-  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'pushFrame', 'popFrame', 'documentSize']
+  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize']
+
+  constructor: (@native) ->
+    @native or= require('webpage').create()
 
-  constructor: (width, height) ->
-    @native          = require('webpage').create()
     @_source         = ""
     @_errors         = []
     @_networkTraffic = {}
-
-    this.setViewportSize(width: width, height: height)
+    @frames          = []
+    @sub_pages       = {}
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
@@ -38,7 +39,6 @@ class Poltergeist.WebPage
   injectAgent: ->
     if @native.evaluate(-> typeof __poltergeist) == "undefined"
       @native.injectJs("#{phantom.libraryPath}/agent.js")
-      @nodes = {}
 
   onConsoleMessageNative: (message) ->
     if message == '__DOMContentLoaded'
@@ -67,25 +67,30 @@ class Poltergeist.WebPage
   onResourceRequestedNative: (request) ->
     @lastRequestId = request.id
 
+    if request.url == @redirectURL
+      @redirectURL = null
+      @requestId   = request.id
+
     @_networkTraffic[request.id] = {
       request:       request,
       responseParts: []
     }
 
   onResourceReceivedNative: (response) ->
-    @_networkTraffic[response.id].responseParts.push(response)
+    @_networkTraffic[response.id]?.responseParts.push(response)
 
     if @requestId == response.id
       if response.redirectURL
-        @requestId = response.id
+        @redirectURL = response.redirectURL
       else
-        @_statusCode = response.status
+        @_statusCode      = response.status
+        @_responseHeaders = response.headers
 
   networkTraffic: ->
     @_networkTraffic
 
   content: ->
-    @native.content
+    @native.frameContent
 
   source: ->
     @_source
@@ -99,6 +104,18 @@ class Poltergeist.WebPage
   statusCode: ->
     @_statusCode
 
+  responseHeaders: ->
+    headers = {}
+    @_responseHeaders.forEach (item) ->
+      headers[item.name] = item.value
+    headers
+
+  cookies: ->
+    @native.cookies
+
+  deleteCookie: (name) ->
+    @native.deleteCookie(name)
+
   viewportSize: ->
     @native.viewportSize
 
@@ -117,6 +134,33 @@ class Poltergeist.WebPage
   setClipRect: (rect) ->
     @native.clipRect = rect
 
+  setUserAgent: (userAgent) ->
+    @native.settings.userAgent = userAgent
+
+  setCustomHeaders: (headers) ->
+    @native.customHeaders = headers
+
+  pushFrame: (name) ->
+    @frames.push(name)
+    res = @native.switchToFrame(name)
+    this.injectAgent()
+    res
+
+  popFrame: ->
+    @frames.pop()
+
+    if @frames.length == 0
+      @native.switchToMainFrame()
+    else
+      @native.switchToFrame(@frames[@frames.length - 1])
+
+  getPage: (name) ->
+    if @sub_pages[name]
+      @sub_pages[name]
+    else
+      page = @native.getPage(name)
+      @sub_pages[name] = new Poltergeist.WebPage(page) if page
+
   dimensions: ->
     scroll   = this.scrollPosition()
     viewport = this.viewportSize()
@@ -144,7 +188,13 @@ class Poltergeist.WebPage
     dimensions
 
   get: (id) ->
-    @nodes[id] or= new Poltergeist.Node(this, id)
+    new Poltergeist.Node(this, id)
+
+  # Before each mouse event we make sure that the mouse is moved to where the
+  # event will take place. This deals with e.g. :hover changes.
+  mouseEvent: (name, x, y) ->
+    this.sendEvent('mousemove', x, y)
+    this.sendEvent(name, x, y)
 
   evaluate: (fn, args...) ->
     JSON.parse @native.evaluate("function() { return PoltergeistAgent.stringify(#{this.stringifyCall(fn, args)}) }")