poltergeist 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83bb04d3f05ad64c5a1b5b213d89acce146434b3
-  data.tar.gz: 6b566336fff00fff1f62fe1161e55beb45e713ce
+  metadata.gz: 6638e15d99597aff8640e53f7664ccbe63aa0767
+  data.tar.gz: 68af8a941ebdde61b19c314de194237f31c1f9c9
 SHA512:
-  metadata.gz: 159c3e618bd128c033e6746738e725b6e4f7cd2be5a9b7da53455c09c58c6f48d98a2eaf4dd0087b355a6259489d419be989bb6df89f5c7d86485a33c7217de2
-  data.tar.gz: bd0c8a67bf6e392e2aff5e5a6cc0e65d818c173e1879d8d6dc1ffc282d4bcc48374fcf6943ff30283e981d6398489125bd7151f7ecf1e8ced971c445ec108dfc
+  metadata.gz: ac7e76188f1052eccd3f7becd4af299bd3b467ad20480edf79f8c6ce22ddba8bd44cee05a717a3d5320ff30104cf64a18fe606f97badcd1a7dca63d1814b401c
+  data.tar.gz: e7938e73c8e55cebd9ad804cc54d4c865cc4ef0eda0af576966ce14a2c53ade5a5dff6ef204451549668f95c10178405ea5a3cde180636efc23c4a2fa7f1b134

data/README.md

@@ -9,7 +9,7 @@ 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.15.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.15.0)**
+(1.16.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.16.0)**
 
 ## Getting help ##
 
@@ -53,11 +53,15 @@ dependencies* (you don't need Qt, or a running X server, etc.)
 
 ### Linux ###
 
-* 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)
+* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-i686.tar.bz2)
+or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2)
 binary.
 * Extract the tarball and copy `bin/phantomjs` into your `PATH`
 
+_DO NOT_ use `phantomjs` from the official Ubuntu repositories, since it doesn't
+work well with `poltergeist`. More information
+[here](https://github.com/teampoltergeist/poltergeist/issues/866).
+
 ### Windows ###
 * Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-windows.zip)
 for Windows

data/lib/capybara/poltergeist/browser.rb

@@ -391,6 +391,10 @@ module Capybara::Poltergeist
       command 'go_forward'
     end
 
+    def refresh
+      command 'refresh'
+    end
+
     def accept_confirm
       command 'set_confirm_process', true
     end
@@ -435,7 +439,7 @@ module Capybara::Poltergeist
       equals:    :Equal,
       Control:   :Ctrl,
       control:   :Ctrl,
-      mulitply:  'numpad*',
+      multiply:  'numpad*',
       add:       'numpad+',
       divide:    'numpad/',
       subtract:  'numpad-',

data/lib/capybara/poltergeist/client.rb

@@ -27,11 +27,14 @@ module Capybara::Poltergeist
             Process.kill('KILL', pid)
           else
             Process.kill('TERM', pid)
-            begin
-              Timeout.timeout(KILL_TIMEOUT) { Process.wait(pid) }
-            rescue Timeout::Error
-              Process.kill('KILL', pid)
-              Process.wait(pid)
+            start = Time.now
+            while Process.wait(pid, Process::WNOHANG).nil?
+              sleep 0.05
+              if (Time.now - start) > KILL_TIMEOUT
+                Process.kill('KILL', pid)
+                Process.wait(pid)
+                break
+              end
             end
           end
         rescue Errno::ESRCH, Errno::ECHILD

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

@@ -19,7 +19,7 @@ class Poltergeist.Browser
     if @page?
       unless @page.closed
         @page.clearLocalStorage() if @page.currentUrl() != 'about:blank'
-        @page.release()
+        @page.close()
       phantom.clearCookies()
 
     @page = @currentPage = new Poltergeist.WebPage
@@ -280,7 +280,7 @@ class Poltergeist.Browser
   close_window: (handle) ->
     page = @getPageByHandle(handle)
     if page
-      page.release()
+      page.close()
       @current_command.sendResponse(true)
     else
       @current_command.sendResponse(false)
@@ -520,6 +520,11 @@ class Poltergeist.Browser
     else
       @current_command.sendResponse(false)
 
+  refresh: ->
+    @currentPage.state = 'wait_for_loading'
+    @currentPage.reload()
+    @_waitForHistoryChange()
+
   set_url_whitelist: (wildcards...)->
     @currentPage.urlWhitelist = (@_wildcardToRegexp(wc) for wc in wildcards)
     @current_command.sendResponse(true)

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

@@ -23,7 +23,7 @@ Poltergeist.Browser = (function() {
         if (this.page.currentUrl() !== 'about:blank') {
           this.page.clearLocalStorage();
         }
-        this.page.release();
+        this.page.close();
       }
       phantom.clearCookies();
     }
@@ -384,7 +384,7 @@ Poltergeist.Browser = (function() {
     var page;
     page = this.getPageByHandle(handle);
     if (page) {
-      page.release();
+      page.close();
       return this.current_command.sendResponse(true);
     } else {
       return this.current_command.sendResponse(false);
@@ -715,6 +715,12 @@ Poltergeist.Browser = (function() {
     }
   };
 
+  Browser.prototype.refresh = function() {
+    this.currentPage.state = 'wait_for_loading';
+    this.currentPage.reload();
+    return this._waitForHistoryChange();
+  };
+
   Browser.prototype.set_url_whitelist = function() {
     var wc, wildcards;
     wildcards = 1 <= arguments.length ? slice.call(arguments, 0) : [];

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

@@ -7,7 +7,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.CALLBACKS = ['onConsoleMessage', 'onError', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onResourceError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
 
-  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward'];
+  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close', 'renderBase64', 'goBack', 'goForward', 'reload'];
 
   WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
 

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

@@ -5,8 +5,8 @@ class Poltergeist.WebPage
                 'onNavigationRequested', 'onUrlChanged', 'onPageCreated',
                 'onClosing']
 
-  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render',
-                'renderBase64', 'goBack', 'goForward']
+  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close',
+                'renderBase64', 'goBack', 'goForward', 'reload']
 
   @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize',
                 'beforeUpload', 'afterUpload', 'clearLocalStorage']

data/lib/capybara/poltergeist/driver.rb

@@ -361,6 +361,10 @@ module Capybara::Poltergeist
       browser.go_forward
     end
 
+    def refresh
+      browser.refresh
+    end
+
     def accept_modal(type, options = {})
       case type
       when :confirm

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.15.0"
+    VERSION = "1.16.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara