poltergeist 1.7.0 → 1.8.0

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

@@ -1,6 +1,6 @@
 class Poltergeist
   constructor: (port, width, height) ->
-    @browser    = new Poltergeist.Browser(this, width, height)
+    @browser    = new Poltergeist.Browser(width, height)
     @connection = new Poltergeist.Connection(this, port)
 
     # The QtWebKit bridge doesn't seem to like Function.prototype.bind
@@ -11,20 +11,21 @@ class Poltergeist
 
   runCommand: (command) ->
     @running = true
-
+    command = new Poltergeist.Cmd(this, command.id, command.name, command.args)
     try
-      @browser.runCommand(command.name, command.args)
+      command.run(@browser)
     catch error
       if error instanceof Poltergeist.Error
-        this.sendError(error)
+        this.sendError(command.id, error)
       else
-        this.sendError(new Poltergeist.BrowserError(error.toString(), error.stack))
+        this.sendError(command.id, new Poltergeist.BrowserError(error.toString(), error.stack))
 
-  sendResponse: (response) ->
-    this.send(response: response)
+  sendResponse: (command_id, response) ->
+    this.send(command_id: command_id, response: response)
 
-  sendError: (error) ->
+  sendError: (command_id, error) ->
     this.send(
+      command_id: command_id,
       error:
         name: error.name || 'Generic',
         args: error.args && error.args() || [error.toString()]
@@ -76,8 +77,9 @@ class Poltergeist.BrowserError extends Poltergeist.Error
   args: -> [@message, @stack]
 
 class Poltergeist.StatusFailError extends Poltergeist.Error
+  constructor: (@url) ->
   name: "Poltergeist.StatusFailError"
-  args: -> []
+  args: -> [@url]
 
 class Poltergeist.NoSuchWindowError extends Poltergeist.Error
   name: "Poltergeist.NoSuchWindowError"
@@ -88,6 +90,7 @@ class Poltergeist.NoSuchWindowError extends Poltergeist.Error
 phantom.injectJs("#{phantom.libraryPath}/web_page.js")
 phantom.injectJs("#{phantom.libraryPath}/node.js")
 phantom.injectJs("#{phantom.libraryPath}/connection.js")
+phantom.injectJs("#{phantom.libraryPath}/cmd.js")
 phantom.injectJs("#{phantom.libraryPath}/browser.js")
 
 system = require 'system'

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

@@ -3,8 +3,9 @@
 class Poltergeist.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', 'path']
+                'isVisible', 'isInViewport', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest',
+                'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection',
+                'path', 'getProperty']
 
   constructor: (@page, @id) ->
 
@@ -31,7 +32,8 @@ class Poltergeist.Node
   mouseEvent: (name) ->
     this.scrollIntoView()
 
-    pos  = this.mouseEventPosition()
+    pos = this.mouseEventPosition()
+
     test = this.mouseEventTest(pos.x, pos.y)
 
     if test.status == 'success'
@@ -68,3 +70,4 @@ class Poltergeist.Node
 
   isEqual: (other) ->
     @page == other.page && this.isDOMEqual(other.id)
+

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

@@ -86,7 +86,7 @@ class Poltergeist.WebPage
     else
       @lastRequestId = request.id
 
-      if request.url == @redirectURL
+      if @normalizeURL(request.url) == @redirectURL
         @redirectURL = null
         @requestId   = request.id
 
@@ -100,7 +100,7 @@ class Poltergeist.WebPage
 
     if @requestId == response.id
       if response.redirectURL
-        @redirectURL = response.redirectURL
+        @redirectURL = @normalizeURL(response.redirectURL)
       else
         @statusCode = response.status
         @_responseHeaders = response.headers
@@ -164,10 +164,10 @@ class Poltergeist.WebPage
   title: ->
     this.native().frameTitle
 
-  frameUrl: (frameName) ->
-    query = (frameName) ->
-      document.querySelector("iframe[name='#{frameName}']")?.src
-    this.evaluate(query, frameName)
+  frameUrl: (frameNameOrId) ->
+    query = (frameNameOrId) ->
+      document.querySelector("iframe[name='#{frameNameOrId}'], iframe[id='#{frameNameOrId}']")?.src
+    this.evaluate(query, frameNameOrId)
 
   clearErrors: ->
     @errors = []
@@ -238,7 +238,16 @@ class Poltergeist.WebPage
       @frames.push(name)
       true
     else
-      false
+      frame_no = this.native().evaluate(
+        (frame_name) ->
+          frames = document.querySelectorAll("iframe, frame")
+          (idx for f, idx in frames when f?['name'] == frame_name or f?['id'] == frame_name)[0]
+        , name)
+      if frame_no? and this.native().switchToFrame(frame_no)
+        @frames.push(name)
+        true
+      else
+        false
 
   popFrame: ->
     @frames.pop()
@@ -299,7 +308,7 @@ class Poltergeist.WebPage
     else
       # The JSON.stringify happens twice because the second time we are essentially
       # escaping the string.
-      "(#{fn.toString()}).apply(this, JSON.parse(#{JSON.stringify(JSON.stringify(args))}))"
+      "(#{fn.toString()}).apply(this, PoltergeistAgent.JSON.parse(#{JSON.stringify(JSON.stringify(args))}))"
 
   # For some reason phantomjs seems to have trouble with doing 'fat arrow' binding here,
   # hence the 'that' closure.
@@ -339,3 +348,8 @@ class Poltergeist.WebPage
 
   canGoForward: ->
     this.native().canGoForward
+
+  normalizeURL: (url) ->
+    parser = document.createElement('a')
+    parser.href = url
+    return parser.href

data/lib/capybara/poltergeist/command.rb

@@ -0,0 +1,17 @@
+require 'securerandom'
+
+module Capybara::Poltergeist
+  class Command
+    attr_reader :id
+
+    def initialize(name, *args)
+      @id = SecureRandom.uuid
+      @name = name
+      @args = args
+    end
+
+    def message
+      JSON.dump({ 'id' => @id, 'name' => @name, 'args' => @args })
+    end
+  end
+end

data/lib/capybara/poltergeist/driver.rb

@@ -200,6 +200,18 @@ module Capybara::Poltergeist
     end
     alias_method :resize_window, :resize
 
+    def resize_window_to(handle, width, height)
+      within_window(handle) do
+        resize(width, height)
+      end
+    end
+
+    def window_size(handle)
+      within_window(handle) do
+        evaluate_script('[window.innerWidth, window.innerHeight]')
+      end
+    end
+
     def scroll_to(left, top)
       browser.scroll_to(left, top)
     end
@@ -244,7 +256,7 @@ module Capybara::Poltergeist
         if @started
           URI.parse(browser.current_url).host
         else
-          Capybara.app_host || "127.0.0.1"
+          URI.parse(Capybara.app_host || '').host || "127.0.0.1"
         end
       end
 
@@ -276,7 +288,10 @@ module Capybara::Poltergeist
 
     def debug
       if @options[:inspector]
-        inspector.open
+        # Fall back to default scheme
+        scheme = URI.parse(browser.current_url).scheme rescue nil
+        scheme = 'http' if scheme != 'https'
+        inspector.open(scheme)
         pause
       else
         raise Error, "To use the remote debugging, you have to launch the driver " \
@@ -285,8 +300,29 @@ module Capybara::Poltergeist
     end
 
     def pause
-      STDERR.puts "Poltergeist execution paused. Press enter to continue."
-      STDIN.gets
+      # STDIN is not necessarily connected to a keyboard. It might even be closed.
+      # So we need a method other than keypress to continue.
+
+      # In jRuby - STDIN returns immediately from select
+      # see https://github.com/jruby/jruby/issues/1783
+      read, write = IO.pipe
+      Thread.new { IO.copy_stream(STDIN, write); write.close }
+
+      STDERR.puts "Poltergeist execution paused. Press enter (or run 'kill -CONT #{Process.pid}') to continue."
+
+      signal = false
+      old_trap = trap('SIGCONT') { signal = true; STDERR.puts "\nSignal SIGCONT received" }
+      keyboard = IO.select([read], nil, nil, 1) until keyboard || signal # wait for data on STDIN or signal SIGCONT received
+
+      begin
+        input = read.read_nonblock(80) # clear out the read buffer
+        puts unless input && input =~ /\n\z/
+      rescue EOFError, IO::WaitReadable # Ignore problems reading from STDIN.
+      end unless signal
+
+      trap('SIGCONT', old_trap) # Restore the previuos signal handler, if there was one.
+
+      STDERR.puts 'Continuing'
     end
 
     def wait?

data/lib/capybara/poltergeist/errors.rb

@@ -55,8 +55,12 @@ module Capybara
     end
 
     class StatusFailError < ClientError
+      def url
+        response['args'].first
+      end
+
       def message
-        "Request failed to reach server, check DNS and/or server status"
+        "Request to '#{url}' failed to reach server, check DNS and/or server status"
       end
     end
 

data/lib/capybara/poltergeist/inspector.rb

@@ -18,15 +18,15 @@ module Capybara::Poltergeist
       @browser ||= self.class.detect_browser
     end
 
-    def url
-      "//localhost:#{port}/"
+    def url(scheme)
+      "#{scheme}://localhost:#{port}/"
     end
 
-    def open
+    def open(scheme)
       if browser
-        Process.spawn(browser, url)
+        Process.spawn(browser, url(scheme))
       else
-        raise Error, "Could not find a browser executable to open #{url}. " \
+        raise Error, "Could not find a browser executable to open #{url(scheme)}. " \
                      "You can specify one manually using e.g. `:inspector => 'chromium'` " \
                      "as a configuration option for Poltergeist."
       end

data/lib/capybara/poltergeist/node.rb

@@ -50,8 +50,23 @@ module Capybara::Poltergeist
       filter_text command(:visible_text)
     end
 
+    def property(name)
+      command :property, name
+    end
+
     def [](name)
-      command :attribute, name
+      # Although the attribute matters, the property is consistent. Return that in
+      # preference to the attribute for links and images.
+      if (tag_name == 'img' and name == 'src') or (tag_name == 'a' and name == 'href' )
+         #if attribute exists get the property
+         value = command(:attribute, name) && command(:property, name)
+         return value
+      end
+
+      value = property(name)
+      value = command(:attribute, name) if value.nil? || value.is_a?(Hash)
+
+      value
     end
 
     def attributes

data/lib/capybara/poltergeist/server.rb

@@ -29,8 +29,8 @@ module Capybara::Poltergeist
       start
     end
 
-    def send(message)
-      @socket.send(message) or raise DeadClient.new(message)
+    def send(command)
+      @socket.send(command.id, command.message) or raise DeadClient.new(command.message)
     end
   end
 end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -24,6 +24,7 @@ module Capybara::Poltergeist
     def initialize(port = nil, timeout = nil)
       @timeout = timeout
       @server  = start_server(port)
+      @receive_mutex = Mutex.new
     end
 
     def start_server(port)
@@ -51,11 +52,14 @@ module Capybara::Poltergeist
     # and use that to initialize a Web Socket.
     def accept
       @socket   = server.accept
-      @messages = []
+      @messages = {}
 
       @driver = ::WebSocket::Driver.server(self)
       @driver.on(:connect) { |event| @driver.start }
-      @driver.on(:message) { |event| @messages << event.data }
+      @driver.on(:message) do |event|
+        command_id = JSON.load(event.data)['command_id']
+        @messages[command_id] = event.data
+      end
     end
 
     def write(data)
@@ -64,25 +68,32 @@ module Capybara::Poltergeist
 
     # Block until the next message is available from the Web Socket.
     # Raises Errno::EWOULDBLOCK if timeout is reached.
-    def receive
+    def receive(cmd_id)
       start = Time.now
 
-      until @messages.any?
+      until @messages.has_key?(cmd_id)
         raise Errno::EWOULDBLOCK if (Time.now - start) >= timeout
-        IO.select([socket], [], [], timeout) or raise Errno::EWOULDBLOCK
-        data = socket.recv(RECV_SIZE)
-        break if data.empty?
-        driver.parse(data)
+        if @receive_mutex.try_lock
+          begin
+            IO.select([socket], [], [], timeout) or raise Errno::EWOULDBLOCK
+            data = socket.recv(RECV_SIZE)
+            break if data.empty?
+            driver.parse(data)
+          ensure
+            @receive_mutex.unlock
+          end
+        else
+          sleep(0.05)
+        end
       end
-
-      @messages.shift
+      @messages.delete(cmd_id)
     end
 
     # Send a message and block until there is a response
-    def send(message)
+    def send(cmd_id, message)
       accept unless connected?
       driver.text(message)
-      receive
+      receive(cmd_id)
     rescue Errno::EWOULDBLOCK
       raise TimeoutError.new(message)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 description: Poltergeist is a driver for Capybara that allows you to run your tests
   on a headless WebKit browser, provided by PhantomJS.
 email:
@@ -193,8 +193,10 @@ files:
 - lib/capybara/poltergeist/client.rb
 - lib/capybara/poltergeist/client/agent.coffee
 - lib/capybara/poltergeist/client/browser.coffee
+- lib/capybara/poltergeist/client/cmd.coffee
 - lib/capybara/poltergeist/client/compiled/agent.js
 - lib/capybara/poltergeist/client/compiled/browser.js
+- lib/capybara/poltergeist/client/compiled/cmd.js
 - lib/capybara/poltergeist/client/compiled/connection.js
 - lib/capybara/poltergeist/client/compiled/main.js
 - lib/capybara/poltergeist/client/compiled/node.js
@@ -203,6 +205,7 @@ files:
 - lib/capybara/poltergeist/client/main.coffee
 - lib/capybara/poltergeist/client/node.coffee
 - lib/capybara/poltergeist/client/web_page.coffee
+- lib/capybara/poltergeist/command.rb
 - lib/capybara/poltergeist/cookie.rb
 - lib/capybara/poltergeist/driver.rb
 - lib/capybara/poltergeist/errors.rb