poltergeist 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804da55f4a9b382633c1ea2388078a0a464dcf20
-  data.tar.gz: 50f49ce4999e47f266a048ada3a4edb453aef88d
+  metadata.gz: 440dc77fc5ba49d78d8e7af8134da82b93a500cd
+  data.tar.gz: afc6fba6b9d6be96866c9810cb1b9a729dddc4a8
 SHA512:
-  metadata.gz: 6129b9fb4c4cd02030a40f4d1afe79a4fb8dbb4244c0bb93b00bfd6587dccb93ece045c089c6731e2538c8abd2ea73ceb18c7aa9fe34a883112a5682493caabe
-  data.tar.gz: 9abd3b5839e1342411eb869c83917fe1a45341278ec663d870274d9f5ca501f897b1b49505367d5f3601cd80eb0e456999b1cfec49f2c96428477f81e7eae8f7
+  metadata.gz: 704dea9cd5162c277fd8b5b9ee2f816beec71d4deabd64616a7ebe87d64d6c8a922a9fd9ba1d9b71b05be8b28eeaacc6aad225140ee47be19c4d8c1536726eb6
+  data.tar.gz: 6ba1c737813c8a09c47a51e31032626ad21e251f1de4a7e05e758057d99702720313950c307d04b458be52ffc665eae5e892ac256e536afdf4baf399bf37b5df

data/README.md

@@ -4,12 +4,12 @@
 
 Poltergeist is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to
 run your Capybara tests on a headless [WebKit](http://webkit.org) browser,
-provided by [PhantomJS](http://www.phantomjs.org/).
+provided by [PhantomJS](http://phantomjs.org/).
 
 **If you're viewing this at https://github.com/teampoltergeist/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.6.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.6.0)**
+(1.7.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.7.0)**
 
 ## Getting help ##
 
@@ -43,17 +43,17 @@ dependencies* (you don't need Qt, or a running X server, etc.)
 
 * *Homebrew*: `brew install phantomjs`
 * *MacPorts*: `sudo port install phantomjs`
-* *Manual install*: [Download this](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-macosx.zip)
+* *Manual install*: [Download this](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-macosx.zip)
 
 ### Linux ###
 
-* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2)
-or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2)
+* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2)
+or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2)
 binary.
 * Extract the tarball and copy `bin/phantomjs` into your `PATH`
 
 ### Windows ###
-* Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-windows.zip)
+* Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-windows.zip)
 for Windows
 
 ### Manual compilation ###
@@ -61,7 +61,7 @@ for Windows
 Do this as a last resort if the binaries don't work for you. It will
 take quite a long time as it has to build WebKit.
 
-* Download [the source tarball](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-source.zip)
+* Download [the source tarball](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-source.zip)
 * Extract and cd in
 * `./build.sh`
 
@@ -235,7 +235,7 @@ See more about [sendEvent](http://phantomjs.org/api/webpage/method/send-event.ht
 
 ## Customization ##
 
-You can customize the way that Capybara sets up Poltegeist via the following code in your
+You can customize the way that Capybara sets up Poltergeist via the following code in your
 test setup:
 
 ``` ruby
@@ -266,6 +266,20 @@ end
 *   `:port` (Fixnum) - The port which should be used to communicate
     with the PhantomJS process. Defaults to a random open port.
 
+### URL Blacklisting ###
+
+Poltergeist supports URL blacklisting which allows you
+to prevent scripts from running on designated domains. If you are experiencing
+slower run times, consider creating a URL blacklist of domains that are not
+essential to your testing environment, such as ad networks or analytics.
+
+```ruby
+page.driver.browser.url_blacklist = ['http://www.example.com']
+```
+
+Make sure you set it before each running test, because this setting's cleaned
+up when capybara does reset.
+
 ## Troubleshooting ##
 
 Unfortunately, the nature of full-stack testing is that things can and
@@ -383,7 +397,7 @@ the [changelog](CHANGELOG.md).
 
 ## License ##
 
-Copyright (c) 2011-2014 Jonathan Leighton
+Copyright (c) 2011-2015 Jonathan Leighton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/capybara/poltergeist/browser.rb

@@ -24,7 +24,9 @@ module Capybara::Poltergeist
       server.restart
       client.restart
 
-      self.debug = @debug if @debug
+      self.debug = @debug if defined?(@debug)
+      self.js_errors = @js_errors if defined?(@js_errors)
+      self.extensions = @extensions if @extensions
     end
 
     def visit(url)
@@ -183,6 +185,10 @@ module Capybara::Poltergeist
       command 'drag', page_id, id, other_id
     end
 
+    def drag_by(page_id, id, x, y)
+      command 'drag_by', page_id, id, x, y
+    end
+
     def select(page_id, id, value)
       command 'select', page_id, id, value
     end
@@ -225,6 +231,10 @@ module Capybara::Poltergeist
       command 'send_keys', page_id, id, normalize_keys(keys)
     end
 
+    def path(page_id, id)
+      command 'path', page_id, id
+    end
+
     def network_traffic
       command('network_traffic').values.map do |event|
         NetworkTraffic::Request.new(
@@ -291,10 +301,12 @@ module Capybara::Poltergeist
     end
 
     def js_errors=(val)
+      @js_errors = val
       command 'set_js_errors', !!val
     end
 
     def extensions=(names)
+      @extensions = names
       Array(names).each do |name|
         command 'add_extension', name
       end
@@ -337,6 +349,32 @@ module Capybara::Poltergeist
       command 'go_forward'
     end
 
+    def accept_confirm
+      command 'set_confirm_process', true
+    end
+
+    def dismiss_confirm
+      command 'set_confirm_process', false
+    end
+
+    #
+    # press "OK" with text (response) or default value
+    #
+    def accept_prompt(response)
+      command 'set_prompt_response', response || false
+    end
+
+    #
+    # press "Cancel"
+    #
+    def dismiss_prompt
+      command 'set_prompt_response', nil
+    end
+
+    def modal_message
+      command 'modal_message'
+    end
+
     private
 
     def log(message)
@@ -354,11 +392,15 @@ module Capybara::Poltergeist
       keys.map do |key|
         case key
         when Array
-          # String itself with modifiers like :alt, :shift, etc
-          raise Error, 'PhantomJS behaviour for key modifiers is currently ' \
-                       'broken, we will add this in later versions'
+          # [:Shift, "s"] => { modifier: "shift", key: "S" }
+          # [:Ctrl, :Left] => { modifier: "ctrl", key: :Left }
+          # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: :Left }
+          letter = key.pop
+          symbol = key.map { |k| k.to_s.downcase }.join(',')
+
+          { modifier: symbol.to_s.downcase, key: letter.capitalize }
         when Symbol
-          { key: key } # Return a known sequence for PhantomJS
+          { key: key.capitalize } # Return a known sequence for PhantomJS
         when String
           key # Plain string, nothing to do
         end

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

@@ -24,8 +24,11 @@ class PoltergeistAgent
       else
         throw error
 
+  # Somehow PhantomJS returns all characters(brackets, etc) properly encoded
+  # except whitespace character in pathname part of the location. This hack
+  # is intended to fix this up.
   currentUrl: ->
-    encodeURI(decodeURI(window.location.href))
+    window.location.href.replace(/\ /g, '%20')
 
   find: (method, selector, within = document) ->
     try
@@ -112,7 +115,15 @@ class PoltergeistAgent.Node
   changed: ->
     event = document.createEvent('HTMLEvents')
     event.initEvent('change', true, false)
-    @element.dispatchEvent(event)
+
+    # In the case of an OPTION tag, the change event should come
+    # from the parent SELECT
+    if @element.nodeName == 'OPTION'
+      element = @element.parentNode
+    else
+      element = @element
+
+    element.dispatchEvent(event)
 
   input: ->
     event = document.createEvent('HTMLEvents')
@@ -152,7 +163,7 @@ class PoltergeistAgent.Node
       if @element.nodeName == "TEXTAREA"
         @element.textContent
       else
-        @element.innerText
+        @element.innerText || @element.textContent
 
   deleteText: ->
     range = document.createRange()
@@ -216,11 +227,17 @@ class PoltergeistAgent.Node
     @element.removeAttribute(name)
 
   select: (value) ->
-    if value == false && !@element.parentNode.multiple
+    if @isDisabled()
+      false
+    else if value == false && !@element.parentNode.multiple
       false
     else
+      this.trigger('focus', @element.parentNode)
+
       @element.selected = value
       this.changed()
+
+      this.trigger('blur', @element.parentNode)
       true
 
   tagName: ->
@@ -239,6 +256,14 @@ class PoltergeistAgent.Node
   isDisabled: ->
     @element.disabled || @element.tagName == 'OPTION' && @element.parentNode.disabled
 
+  path: ->
+    elements = @parentIds().reverse().map((id) => @agent.get(id))
+    elements.push(this)
+    selectors = elements.map (el)->
+      prev_siblings = el.find('xpath', "./preceding-sibling::#{el.tagName()}")
+      "#{el.tagName()}[#{prev_siblings.length + 1}]"
+    "//" + selectors.join('/')
+
   containsSelection: ->
     selectedNode = document.getSelection().focusNode
 
@@ -257,7 +282,7 @@ class PoltergeistAgent.Node
       rect  = win.frameElement.getClientRects()[0]
       style = win.getComputedStyle(win.frameElement)
       win   = win.parent
-      
+
       offset.top  += rect.top + parseInt(style.getPropertyValue("padding-top"), 10)
       offset.left += rect.left + parseInt(style.getPropertyValue("padding-left"), 10)
 
@@ -279,7 +304,7 @@ class PoltergeistAgent.Node
 
     pos
 
-  trigger: (name) ->
+  trigger: (name, element = @element) ->
     if Node.EVENTS.MOUSE.indexOf(name) != -1
       event = document.createEvent('MouseEvent')
       event.initMouseEvent(
@@ -293,7 +318,7 @@ class PoltergeistAgent.Node
     else
       throw "Unknown event"
 
-    @element.dispatchEvent(event)
+    element.dispatchEvent(event)
 
   obtainEvent: (name) ->
     event = document.createEvent('HTMLEvents')
@@ -372,6 +397,3 @@ document.addEventListener(
   'DOMContentLoaded',
   -> console.log('__DOMContentLoaded')
 )
-
-window.confirm = (message) -> true
-window.prompt  = (message, _default) -> _default or null

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

@@ -7,6 +7,10 @@ class Poltergeist.Browser
     @_debug     = false
     @_counter   = 0
 
+    @processed_modal_messages = []
+    @confirm_processes = []
+    @prompt_responses = []
+
     this.resetPage()
 
   resetPage: ->
@@ -23,6 +27,28 @@ class Poltergeist.Browser
     @page.handle = "#{@_counter++}"
     @pages.push(@page)
 
+    @processed_modal_messages = []
+    @confirm_processes = []
+    @prompt_responses = []
+
+
+    @page.native().onAlert = (msg) =>
+      @setModalMessage msg
+      return
+
+    @page.native().onConfirm = (msg) =>
+      process = @confirm_processes.pop()
+      process = true if process == undefined
+      @setModalMessage msg
+      return process
+
+    @page.native().onPrompt = (msg, defaultVal) =>
+      response = @prompt_responses.pop()
+      response = defaultVal if (response == undefined || response == false)
+
+      @setModalMessage msg
+      return response
+
     @page.onPageCreated = (newPage) =>
       page = new Poltergeist.WebPage(newPage)
       page.handle = "#{@_counter++}"
@@ -39,6 +65,9 @@ class Poltergeist.Browser
     if @_debug
       console.log "poltergeist [#{new Date().getTime()}] #{message}"
 
+  setModalMessage: (msg) ->
+    @processed_modal_messages.push(msg)
+
   sendResponse: (response) ->
     errors = @currentPage.errors
     @currentPage.clearErrors()
@@ -60,6 +89,11 @@ class Poltergeist.Browser
 
   visit: (url) ->
     @currentPage.state = 'loading'
+    #reset modal processing state when changing page
+    @processed_modal_messages = []
+    @confirm_processes = []
+    @prompt_responses = []
+
 
     # Prevent firing `page.onInitialized` event twice. Calling currentUrl
     # method before page is actually opened fires this event for the first time.
@@ -149,6 +183,9 @@ class Poltergeist.Browser
   disabled: (page_id, id) ->
     this.sendResponse this.node(page_id, id).isDisabled()
 
+  path: (page_id, id) ->
+    this.sendResponse this.node(page_id, id).path()
+
   evaluate: (script) ->
     this.sendResponse @currentPage.evaluate("function() { return #{script} }")
 
@@ -255,6 +292,10 @@ class Poltergeist.Browser
     this.node(page_id, id).dragTo this.node(page_id, other_id)
     this.sendResponse(true)
 
+  drag_by: (page_id, id, x, y) ->
+    this.node(page_id, id).dragBy(x, y)
+    this.sendResponse(true)
+
   trigger: (page_id, id, event) ->
     this.node(page_id, id).trigger(event)
     this.sendResponse(event)
@@ -280,7 +321,15 @@ class Poltergeist.Browser
 
     for sequence in keys
       key = if sequence.key? then @currentPage.keyCode(sequence.key) else sequence
-      @currentPage.sendEvent('keypress', key)
+      if sequence.modifier?
+        modifier_keys = @currentPage.keyModifierKeys(sequence.modifier)
+        modifier_code = @currentPage.keyModifierCode(sequence.modifier)
+        @currentPage.sendEvent('keydown', modifier_key) for modifier_key in modifier_keys
+        @currentPage.sendEvent('keypress', key, null, null, modifier_code)
+        @currentPage.sendEvent('keyup', modifier_key) for modifier_key in modifier_keys
+      else
+        @currentPage.sendEvent('keypress', key)
+
     this.sendResponse(true)
 
   render_base64: (format, full, selector = null)->
@@ -415,3 +464,14 @@ class Poltergeist.Browser
   set_url_blacklist: ->
     @currentPage.urlBlacklist = Array.prototype.slice.call(arguments)
     @sendResponse(true)
+
+  set_confirm_process: (process) ->
+    @confirm_processes.push process
+    @sendResponse(true)
+
+  set_prompt_response: (response) ->
+    @prompt_responses.push response
+    @sendResponse(true)
+
+  modal_message: ->
+    @sendResponse(@processed_modal_messages.shift())

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

@@ -44,7 +44,7 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.currentUrl = function() {
-    return encodeURI(decodeURI(window.location.href));
+    return window.location.href.replace(/\ /g, '%20');
   };
 
   PoltergeistAgent.prototype.find = function(method, selector, within) {
@@ -195,10 +195,15 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.changed = function() {
-    var event;
+    var element, event;
     event = document.createEvent('HTMLEvents');
     event.initEvent('change', true, false);
-    return this.element.dispatchEvent(event);
+    if (this.element.nodeName === 'OPTION') {
+      element = this.element.parentNode;
+    } else {
+      element = this.element;
+    }
+    return element.dispatchEvent(event);
   };
 
   Node.prototype.input = function() {
@@ -246,7 +251,7 @@ PoltergeistAgent.Node = (function() {
       if (this.element.nodeName === "TEXTAREA") {
         return this.element.textContent;
       } else {
-        return this.element.innerText;
+        return this.element.innerText || this.element.textContent;
       }
     }
   };
@@ -340,11 +345,15 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.select = function(value) {
-    if (value === false && !this.element.parentNode.multiple) {
+    if (this.isDisabled()) {
+      return false;
+    } else if (value === false && !this.element.parentNode.multiple) {
       return false;
     } else {
+      this.trigger('focus', this.element.parentNode);
       this.element.selected = value;
       this.changed();
+      this.trigger('blur', this.element.parentNode);
       return true;
     }
   };
@@ -370,6 +379,21 @@ PoltergeistAgent.Node = (function() {
     return this.element.disabled || this.element.tagName === 'OPTION' && this.element.parentNode.disabled;
   };
 
+  Node.prototype.path = function() {
+    var elements, selectors,
+      _this = this;
+    elements = this.parentIds().reverse().map(function(id) {
+      return _this.agent.get(id);
+    });
+    elements.push(this);
+    selectors = elements.map(function(el) {
+      var prev_siblings;
+      prev_siblings = el.find('xpath', "./preceding-sibling::" + (el.tagName()));
+      return "" + (el.tagName()) + "[" + (prev_siblings.length + 1) + "]";
+    });
+    return "//" + selectors.join('/');
+  };
+
   Node.prototype.containsSelection = function() {
     var selectedNode;
     selectedNode = document.getSelection().focusNode;
@@ -417,8 +441,11 @@ PoltergeistAgent.Node = (function() {
     return pos;
   };
 
-  Node.prototype.trigger = function(name) {
+  Node.prototype.trigger = function(name, element) {
     var event;
+    if (element == null) {
+      element = this.element;
+    }
     if (Node.EVENTS.MOUSE.indexOf(name) !== -1) {
       event = document.createEvent('MouseEvent');
       event.initMouseEvent(name, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
@@ -429,7 +456,7 @@ PoltergeistAgent.Node = (function() {
     } else {
       throw "Unknown event";
     }
-    return this.element.dispatchEvent(event);
+    return element.dispatchEvent(event);
   };
 
   Node.prototype.obtainEvent = function(name) {
@@ -529,11 +556,3 @@ window.__poltergeist = new PoltergeistAgent;
 document.addEventListener('DOMContentLoaded', function() {
   return console.log('__DOMContentLoaded');
 });
-
-window.confirm = function(message) {
-  return true;
-};
-
-window.prompt = function(message, _default) {
-  return _default || null;
-};

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

@@ -9,6 +9,9 @@ Poltergeist.Browser = (function() {
     this.js_errors = true;
     this._debug = false;
     this._counter = 0;
+    this.processed_modal_messages = [];
+    this.confirm_processes = [];
+    this.prompt_responses = [];
     this.resetPage();
   }
 
@@ -32,6 +35,30 @@ Poltergeist.Browser = (function() {
     });
     this.page.handle = "" + (this._counter++);
     this.pages.push(this.page);
+    this.processed_modal_messages = [];
+    this.confirm_processes = [];
+    this.prompt_responses = [];
+    this.page["native"]().onAlert = function(msg) {
+      _this.setModalMessage(msg);
+    };
+    this.page["native"]().onConfirm = function(msg) {
+      var process;
+      process = _this.confirm_processes.pop();
+      if (process === void 0) {
+        process = true;
+      }
+      _this.setModalMessage(msg);
+      return process;
+    };
+    this.page["native"]().onPrompt = function(msg, defaultVal) {
+      var response;
+      response = _this.prompt_responses.pop();
+      if (response === void 0 || response === false) {
+        response = defaultVal;
+      }
+      _this.setModalMessage(msg);
+      return response;
+    };
     return this.page.onPageCreated = function(newPage) {
       var page;
       page = new Poltergeist.WebPage(newPage);
@@ -57,6 +84,10 @@ Poltergeist.Browser = (function() {
     }
   };
 
+  Browser.prototype.setModalMessage = function(msg) {
+    return this.processed_modal_messages.push(msg);
+  };
+
   Browser.prototype.sendResponse = function(response) {
     var errors;
     errors = this.currentPage.errors;
@@ -85,6 +116,9 @@ Poltergeist.Browser = (function() {
     var prevUrl,
       _this = this;
     this.currentPage.state = 'loading';
+    this.processed_modal_messages = [];
+    this.confirm_processes = [];
+    this.prompt_responses = [];
     prevUrl = this.currentPage.source === null ? 'about:blank' : this.currentPage.currentUrl();
     this.currentPage.open(url);
     if (/#/.test(url) && prevUrl.split('#')[0] === url.split('#')[0]) {
@@ -194,6 +228,10 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(this.node(page_id, id).isDisabled());
   };
 
+  Browser.prototype.path = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).path());
+  };
+
   Browser.prototype.evaluate = function(script) {
     return this.sendResponse(this.currentPage.evaluate("function() { return " + script + " }"));
   };
@@ -347,6 +385,11 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.drag_by = function(page_id, id, x, y) {
+    this.node(page_id, id).dragBy(x, y);
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.trigger = function(page_id, id, event) {
     this.node(page_id, id).trigger(event);
     return this.sendResponse(event);
@@ -370,7 +413,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.send_keys = function(page_id, id, keys) {
-    var key, sequence, target, _i, _len;
+    var key, modifier_code, modifier_key, modifier_keys, sequence, target, _i, _j, _k, _len, _len1, _len2;
     target = this.node(page_id, id);
     if (!target.containsSelection()) {
       target.mouseEvent('click');
@@ -378,7 +421,21 @@ Poltergeist.Browser = (function() {
     for (_i = 0, _len = keys.length; _i < _len; _i++) {
       sequence = keys[_i];
       key = sequence.key != null ? this.currentPage.keyCode(sequence.key) : sequence;
-      this.currentPage.sendEvent('keypress', key);
+      if (sequence.modifier != null) {
+        modifier_keys = this.currentPage.keyModifierKeys(sequence.modifier);
+        modifier_code = this.currentPage.keyModifierCode(sequence.modifier);
+        for (_j = 0, _len1 = modifier_keys.length; _j < _len1; _j++) {
+          modifier_key = modifier_keys[_j];
+          this.currentPage.sendEvent('keydown', modifier_key);
+        }
+        this.currentPage.sendEvent('keypress', key, null, null, modifier_code);
+        for (_k = 0, _len2 = modifier_keys.length; _k < _len2; _k++) {
+          modifier_key = modifier_keys[_k];
+          this.currentPage.sendEvent('keyup', modifier_key);
+        }
+      } else {
+        this.currentPage.sendEvent('keypress', key);
+      }
     }
     return this.sendResponse(true);
   };
@@ -570,6 +627,20 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.set_confirm_process = function(process) {
+    this.confirm_processes.push(process);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.set_prompt_response = function(response) {
+    this.prompt_responses.push(response);
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.modal_message = function() {
+    return this.sendResponse(this.processed_modal_messages.shift());
+  };
+
   return Browser;
 
 })();

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', 'getAttributes', 'isVisible', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection'];
+  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'];
 
   function Node(page, id) {
     this.page = page;
@@ -68,6 +68,18 @@ Poltergeist.Node = (function() {
     return this.page.mouseEvent('mouseup', otherPosition.x, otherPosition.y);
   };
 
+  Node.prototype.dragBy = function(x, y) {
+    var final_pos, position;
+    this.scrollIntoView();
+    position = this.mouseEventPosition();
+    final_pos = {
+      x: position.x + x,
+      y: position.y + y
+    };
+    this.page.mouseEvent('mousedown', position.x, position.y);
+    return this.page.mouseEvent('mouseup', final_pos.x, final_pos.y);
+  };
+
   Node.prototype.isEqual = function(other) {
     return this.page === other.page && this.isDOMEqual(other.id);
   };

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

@@ -5,7 +5,7 @@ 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', 'onPageCreated', 'onClosing'];
+  WebPage.CALLBACKS = ['onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
 
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward'];
 
@@ -185,6 +185,22 @@ Poltergeist.WebPage = (function() {
     return this["native"]().event.key[name];
   };
 
+  WebPage.prototype.keyModifierCode = function(names) {
+    var modifiers;
+    modifiers = this["native"]().event.modifier;
+    names = names.split(',').map((function(name) {
+      return modifiers[name];
+    }));
+    return names[0] | names[1];
+  };
+
+  WebPage.prototype.keyModifierKeys = function(names) {
+    var _this = this;
+    return names.split(',').map(function(name) {
+      return _this.keyCode(name.charAt(0).toUpperCase() + name.substring(1));
+    });
+  };
+
   WebPage.prototype.waitState = function(state, callback) {
     var _this = this;
     if (this.state === state) {

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

@@ -4,7 +4,7 @@ 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']
+                'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection', 'path']
 
   constructor: (@page, @id) ->
 
@@ -53,5 +53,18 @@ class Poltergeist.Node
     @page.mouseEvent('mousedown', position.x,      position.y)
     @page.mouseEvent('mouseup',   otherPosition.x, otherPosition.y)
 
+  dragBy: (x, y) ->
+    this.scrollIntoView()
+
+    position      = this.mouseEventPosition()
+
+    final_pos =
+      x: position.x + x
+      y: position.y + y
+
+    @page.mouseEvent('mousedown', position.x, position.y)
+    @page.mouseEvent('mouseup', final_pos.x, final_pos.y)
+
+
   isEqual: (other) ->
     @page == other.page && this.isDOMEqual(other.id)

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

@@ -1,8 +1,9 @@
 class Poltergeist.WebPage
-  @CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished',
-                'onInitialized', 'onLoadStarted', 'onResourceRequested',
-                'onResourceReceived', 'onError', 'onNavigationRequested',
-                'onUrlChanged', 'onPageCreated', 'onClosing']
+  @CALLBACKS = ['onConsoleMessage',
+                'onLoadFinished', 'onInitialized', 'onLoadStarted',
+                'onResourceRequested', 'onResourceReceived', 'onError',
+                'onNavigationRequested', 'onUrlChanged', 'onPageCreated',
+                'onClosing']
 
   @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render',
                 'renderBase64', 'goBack', 'goForward']
@@ -78,7 +79,7 @@ class Poltergeist.WebPage
   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()
@@ -126,6 +127,15 @@ class Poltergeist.WebPage
   keyCode: (name) ->
     this.native().event.key[name]
 
+  keyModifierCode: (names) ->
+    modifiers = this.native().event.modifier
+    names = names.split(',').map ((name) -> modifiers[name])
+    names[0] | names[1] # return codes for 1 or 2 modifiers
+
+  keyModifierKeys: (names) ->
+    names.split(',').map (name) =>
+      this.keyCode(name.charAt(0).toUpperCase() + name.substring(1))
+
   waitState: (state, callback) ->
     if @state == state
       callback.call()

data/lib/capybara/poltergeist/driver.rb

@@ -4,7 +4,7 @@ module Capybara::Poltergeist
   class Driver < Capybara::Driver::Base
     DEFAULT_TIMEOUT = 30
 
-    attr_reader :app, :server, :client, :browser, :options
+    attr_reader :app, :options
 
     def initialize(app, options = {})
       @app       = app
@@ -304,5 +304,51 @@ module Capybara::Poltergeist
     def go_forward
       browser.go_forward
     end
+
+    def accept_modal(type, options = {})
+      case type
+      when :confirm
+        browser.accept_confirm
+      when :prompt
+        browser.accept_prompt options[:with]
+      end
+
+      yield if block_given?
+
+      find_modal(options)
+    end
+
+    def dismiss_modal(type, options = {})
+      case type
+      when :confirm
+        browser.dismiss_confirm
+      when :prompt
+        browser.dismiss_prompt
+      end
+
+      yield if block_given?
+      find_modal(options)
+    end
+
+    private
+
+    def find_modal(options)
+      start_time    = Time.now
+      timeout_sec   = options[:wait] || begin Capybara.default_max_wait_time rescue Capybara.default_wait_time end
+      expect_text   = options[:text]
+      not_found_msg = 'Unable to find modal dialog'
+      not_found_msg += " with #{expect_text}" if expect_text
+
+      begin
+        modal_text = browser.modal_message
+        raise Capybara::ModalNotFound if modal_text.nil?
+        raise Capybara::ModalNotFound if (expect_text && (modal_text != expect_text))
+      rescue Capybara::ModalNotFound => e
+        raise e, not_found_msg if (Time.now - start_time) >= timeout_sec
+        sleep(0.05)
+        retry
+      end
+      modal_text
+    end
   end
 end

data/lib/capybara/poltergeist/node.rb

@@ -132,6 +132,10 @@ module Capybara::Poltergeist
       command :drag, other.id
     end
 
+    def drag_by(x, y)
+      command :drag_by, x, y
+    end
+
     def trigger(event)
       command :trigger, event
     end
@@ -145,6 +149,10 @@ module Capybara::Poltergeist
     end
     alias_method :send_key, :send_keys
 
+    def path
+      command :path
+    end
+
     private
 
     def filter_text(text)

data/lib/capybara/poltergeist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -178,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rerun
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: Poltergeist is a driver for Capybara that allows you to run your tests
   on a headless WebKit browser, provided by PhantomJS.
 email:
@@ -230,7 +216,7 @@ files:
 - lib/capybara/poltergeist/utility.rb
 - lib/capybara/poltergeist/version.rb
 - lib/capybara/poltergeist/web_socket_server.rb
-homepage: http://github.com/teampoltergeist/poltergeist
+homepage: https://github.com/teampoltergeist/poltergeist
 licenses:
 - MIT
 metadata: {}
@@ -250,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara