poltergeist 1.5.1 → 1.6.0

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

@@ -75,6 +75,14 @@ class Poltergeist.BrowserError extends Poltergeist.Error
   name: "Poltergeist.BrowserError"
   args: -> [@message, @stack]
 
+class Poltergeist.StatusFailError extends Poltergeist.Error
+  name: "Poltergeist.StatusFailError"
+  args: -> []
+
+class Poltergeist.NoSuchWindowError extends Poltergeist.Error
+  name: "Poltergeist.NoSuchWindowError"
+  args: -> []
+
 # We're using phantom.libraryPath so that any stack traces
 # report the full path.
 phantom.injectJs("#{phantom.libraryPath}/web_page.js")
@@ -82,4 +90,5 @@ phantom.injectJs("#{phantom.libraryPath}/node.js")
 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/node.coffee

@@ -2,9 +2,9 @@
 
 class Poltergeist.Node
   @DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete',
-                'removeAttribute', 'isMultiple', 'select', 'tagName', 'find',
-                'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest',
-                'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText']
+                'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'getAttributes',
+                'isVisible', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest',
+                'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection']
 
   constructor: (@page, @id) ->
 
@@ -35,7 +35,11 @@ class Poltergeist.Node
     test = this.mouseEventTest(pos.x, pos.y)
 
     if test.status == 'success'
-      @page.mouseEvent(name, pos.x, pos.y)
+      if name == 'rightclick'
+        @page.mouseEvent('click', pos.x, pos.y, 'right')
+        this.trigger('contextmenu')
+      else
+        @page.mouseEvent(name, pos.x, pos.y)
       pos
     else
       throw new Poltergeist.MouseEventFailed(name, test.selector, pos)

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

@@ -1,22 +1,30 @@
 class Poltergeist.WebPage
-  @CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized',
-                'onLoadStarted', 'onResourceRequested', 'onResourceReceived',
-                'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated']
+  @CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished',
+                'onInitialized', 'onLoadStarted', 'onResourceRequested',
+                'onResourceReceived', 'onError', 'onNavigationRequested',
+                'onUrlChanged', 'onPageCreated', 'onClosing']
 
-  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward']
+  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render',
+                'renderBase64', 'goBack', 'goForward']
 
-  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload']
+  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize',
+                'beforeUpload', 'afterUpload', 'clearLocalStorage']
 
   @EXTENSIONS = []
 
-  constructor: (@native) ->
-    @native or= require('webpage').create()
+  constructor: (@_native) ->
+    @_native or= require('webpage').create()
 
-    @_source         = null
-    @_errors         = []
-    @_networkTraffic = {}
-    @_temp_headers   = {}
+    @id              = 0
+    @source          = null
+    @closed          = false
+    @state           = 'default'
+    @urlBlacklist    = []
     @frames          = []
+    @errors          = []
+    @_networkTraffic = {}
+    @_tempHeaders    = {}
+    @_blockedUrls    = []
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
@@ -29,37 +37,33 @@ class Poltergeist.WebPage
   for delegate in @DELEGATES
     do (delegate) =>
       this.prototype[delegate] =
-        -> @native[delegate].apply(@native, arguments)
+        -> @_native[delegate].apply(@_native, arguments)
 
   onInitializedNative: ->
-    @_source = null
+    @id += 1
+    @source = null
     @injectAgent()
     this.removeTempHeaders()
     this.setScrollPosition(left: 0, top: 0)
 
-  injectAgent: ->
-    if @native.evaluate(-> typeof __poltergeist) == "undefined"
-      @native.injectJs "#{phantom.libraryPath}/agent.js"
-      for extension in WebPage.EXTENSIONS
-        @native.injectJs extension
-
-  injectExtension: (file) ->
-    WebPage.EXTENSIONS.push file
-    @native.injectJs file
+  onClosingNative: ->
+    @handle = null
+    @closed = true
 
   onConsoleMessageNative: (message) ->
     if message == '__DOMContentLoaded'
-      @_source = @native.content
+      @source = @_native.content
       false
+    else
+      console.log(message)
 
   onLoadStartedNative: ->
+    @state = 'loading'
     @requestId = @lastRequestId
 
-  onLoadFinishedNative: ->
-    @_source or= @native.content
-
-  onConsoleMessage: (message) ->
-    console.log(message)
+  onLoadFinishedNative: (@status) ->
+    @state = 'default'
+    @source or= @_native.content
 
   onErrorNative: (message, stack) ->
     stackString = message
@@ -69,19 +73,26 @@ class Poltergeist.WebPage
       stackString += "    at #{frame.file}:#{frame.line}"
       stackString += " in #{frame.function}" if frame.function && frame.function != ''
 
-    @_errors.push(message: message, stack: stackString)
+    @errors.push(message: message, stack: stackString)
 
-  onResourceRequestedNative: (request) ->
-    @lastRequestId = request.id
+  onResourceRequestedNative: (request, net) ->
+    abort = @urlBlacklist.some (blacklisted_url) ->
+      request.url.indexOf(blacklisted_url) != -1
+  
+    if abort
+      @_blockedUrls.push request.url unless request.url in @_blockedUrls
+      net.abort()
+    else
+      @lastRequestId = request.id
 
-    if request.url == @redirectURL
-      @redirectURL = null
-      @requestId   = request.id
+      if request.url == @redirectURL
+        @redirectURL = null
+        @requestId   = request.id
 
-    @_networkTraffic[request.id] = {
-      request:       request,
-      responseParts: []
-    }
+      @_networkTraffic[request.id] = {
+        request:       request,
+        responseParts: []
+      }
 
   onResourceReceivedNative: (response) ->
     @_networkTraffic[response.id]?.responseParts.push(response)
@@ -90,12 +101,40 @@ class Poltergeist.WebPage
       if response.redirectURL
         @redirectURL = response.redirectURL
       else
-        @_statusCode      = response.status
+        @statusCode = response.status
         @_responseHeaders = response.headers
 
+  injectAgent: ->
+    if this.native().evaluate(-> typeof __poltergeist) == "undefined"
+      this.native().injectJs "#{phantom.libraryPath}/agent.js"
+      for extension in WebPage.EXTENSIONS
+        this.native().injectJs extension
+
+  injectExtension: (file) ->
+    WebPage.EXTENSIONS.push file
+    this.native().injectJs file
+
+  native: ->
+    if @closed
+      throw new Poltergeist.NoSuchWindowError
+    else
+      @_native
+
+  windowName: ->
+    this.native().windowName
+
+  keyCode: (name) ->
+    this.native().event.key[name]
+
+  waitState: (state, callback) ->
+    if @state == state
+      callback.call()
+    else
+      setTimeout (=> @waitState(state, callback)), 100
+
   setHttpAuth: (user, password) ->
-    @native.settings.userName = user
-    @native.settings.password = password
+    this.native().settings.userName = user
+    this.native().settings.password = password
 
   networkTraffic: ->
     @_networkTraffic
@@ -103,23 +142,25 @@ class Poltergeist.WebPage
   clearNetworkTraffic: ->
     @_networkTraffic = {}
 
-  content: ->
-    @native.frameContent
+  blockedUrls: ->
+    @_blockedUrls
 
-  source: ->
-    @_source
+  clearBlockedUrls: ->
+    @_blockedUrls = []
+
+  content: ->
+    this.native().frameContent
 
   title: ->
-    @native.frameTitle
+    this.native().frameTitle
 
-  errors: ->
-    @_errors
+  frameUrl: (frameName) ->
+    query = (frameName) ->
+      document.querySelector("iframe[name='#{frameName}']")?.src
+    this.evaluate(query, frameName)
 
   clearErrors: ->
-    @_errors = []
-
-  statusCode: ->
-    @_statusCode
+    @errors = []
 
   responseHeaders: ->
     headers = {}
@@ -128,74 +169,70 @@ class Poltergeist.WebPage
     headers
 
   cookies: ->
-    @native.cookies
+    this.native().cookies
 
   deleteCookie: (name) ->
-    @native.deleteCookie(name)
+    this.native().deleteCookie(name)
 
   viewportSize: ->
-    @native.viewportSize
+    this.native().viewportSize
 
   setViewportSize: (size) ->
-    @native.viewportSize = size
+    this.native().viewportSize = size
+
+  setZoomFactor: (zoom_factor) ->
+    this.native().zoomFactor = zoom_factor
 
   setPaperSize: (size) ->
-    @native.paperSize = size
+    this.native().paperSize = size
 
   scrollPosition: ->
-    @native.scrollPosition
+    this.native().scrollPosition
 
   setScrollPosition: (pos) ->
-    @native.scrollPosition = pos
+    this.native().scrollPosition = pos
 
   clipRect: ->
-    @native.clipRect
+    this.native().clipRect
 
   setClipRect: (rect) ->
-    @native.clipRect = rect
+    this.native().clipRect = rect
 
   elementBounds: (selector) ->
-    @native.evaluate(
+    this.native().evaluate(
       (selector) -> document.querySelector(selector).getBoundingClientRect(),
       selector
     )
 
   setUserAgent: (userAgent) ->
-    @native.settings.userAgent = userAgent
+    this.native().settings.userAgent = userAgent
 
   getCustomHeaders: ->
-    @native.customHeaders
+    this.native().customHeaders
 
   setCustomHeaders: (headers) ->
-    @native.customHeaders = headers
+    this.native().customHeaders = headers
 
   addTempHeader: (header) ->
     for name, value of header
-      @_temp_headers[name] = value
+      @_tempHeaders[name] = value
 
   removeTempHeaders: ->
     allHeaders = this.getCustomHeaders()
-    for name, value of @_temp_headers
+    for name, value of @_tempHeaders
       delete allHeaders[name]
     this.setCustomHeaders(allHeaders)
 
   pushFrame: (name) ->
-    if @native.switchToFrame(name)
+    if this.native().switchToFrame(name)
       @frames.push(name)
       true
     else
       false
 
-  pages: ->
-    @native.pagesWindowName
-
   popFrame: ->
     @frames.pop()
-    @native.switchToParentFrame()
-
-  getPage: (name) ->
-    page = @native.getPage(name)
-    new Poltergeist.WebPage(page) if page
+    this.native().switchToParentFrame()
 
   dimensions: ->
     scroll   = this.scrollPosition()
@@ -228,16 +265,23 @@ class Poltergeist.WebPage
 
   # 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) ->
+  mouseEvent: (name, x, y, button = 'left') ->
     this.sendEvent('mousemove', x, y)
-    this.sendEvent(name, x, y)
+    this.sendEvent(name, x, y, button)
 
   evaluate: (fn, args...) ->
     this.injectAgent()
-    JSON.parse @native.evaluate("function() { return PoltergeistAgent.stringify(#{this.stringifyCall(fn, args)}) }")
+    JSON.parse this.sanitize(this.native().evaluate("function() { return PoltergeistAgent.stringify(#{this.stringifyCall(fn, args)}) }"))
+
+  sanitize: (potential_string) ->
+    if typeof(potential_string) == "string"
+      # JSON doesn't like \r or \n in strings unless escaped
+      potential_string.replace("\n","\\n").replace("\r","\\r")
+    else
+      potential_string
 
   execute: (fn, args...) ->
-    @native.evaluate("function() { #{this.stringifyCall(fn, args)} }")
+    this.native().evaluate("function() { #{this.stringifyCall(fn, args)} }")
 
   stringifyCall: (fn, args) ->
     if args.length == 0
@@ -251,7 +295,7 @@ class Poltergeist.WebPage
   # hence the 'that' closure.
   bindCallback: (name) ->
     that = this
-    @native[name] = ->
+    this.native()[name] = ->
       if that[name + 'Native']? # For internal callbacks
         result = that[name + 'Native'].apply(that, arguments)
 
@@ -267,20 +311,21 @@ class Poltergeist.WebPage
       name, args
     )
 
-    if result.error?
-      switch result.error.message
-        when 'PoltergeistAgent.ObsoleteNode'
-          throw new Poltergeist.ObsoleteNode
-        when 'PoltergeistAgent.InvalidSelector'
-          [method, selector] = args
-          throw new Poltergeist.InvalidSelector(method, selector)
-        else
-          throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
-    else
-      result.value
+    if result != null
+      if result.error?
+        switch result.error.message
+          when 'PoltergeistAgent.ObsoleteNode'
+            throw new Poltergeist.ObsoleteNode
+          when 'PoltergeistAgent.InvalidSelector'
+            [method, selector] = args
+            throw new Poltergeist.InvalidSelector(method, selector)
+          else
+            throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
+      else
+        result.value
 
   canGoBack: ->
-    @native.canGoBack
+    this.native().canGoBack
 
   canGoForward: ->
-    @native.canGoForward
+    this.native().canGoForward

data/lib/capybara/poltergeist/driver.rb

@@ -49,6 +49,12 @@ module Capybara::Poltergeist
 
     def phantomjs_options
       list = options[:phantomjs_options] || []
+
+      # PhantomJS defaults to only using SSLv3, which since POODLE (Oct 2014)
+      # many sites have dropped from their supported protocols (eg PayPal,
+      # Braintree).
+      list += ["--ssl-protocol=any"] unless list.grep(/ssl-protocol/).any?
+
       list += ["--remote-debugger-port=#{inspector.port}", "--remote-debugger-autorun=yes"] if inspector
       list
     end
@@ -139,14 +145,34 @@ module Capybara::Poltergeist
       browser.within_frame(name, &block)
     end
 
-    def within_window(name, &block)
-      browser.within_window(name, &block)
+    def current_window_handle
+      browser.window_handle
     end
 
     def window_handles
       browser.window_handles
     end
 
+    def close_window(handle)
+      browser.close_window(handle)
+    end
+
+    def open_new_window
+      browser.open_new_window
+    end
+
+    def switch_to_window(handle)
+      browser.switch_to_window(handle)
+    end
+
+    def within_window(name, &block)
+      browser.within_window(name, &block)
+    end
+
+    def no_such_window_error
+      NoSuchWindowError
+    end
+
     def reset!
       browser.reset
       @started = false
@@ -165,6 +191,10 @@ module Capybara::Poltergeist
       browser.set_paper_size(size)
     end
 
+    def zoom_factor=(zoom_factor)
+      browser.set_zoom_factor(zoom_factor)
+    end
+
     def resize(width, height)
       browser.resize(width, height)
     end
@@ -225,6 +255,10 @@ module Capybara::Poltergeist
       browser.remove_cookie(name)
     end
 
+    def clear_cookies
+      browser.clear_cookies
+    end
+
     def cookies_enabled=(flag)
       browser.cookies_enabled = flag
     end