Add Driver#refresh

teampoltergeist · Jul 5, 2017 · 544d08a · 544d08a
1 parent eb83083
commit 544d08a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/lib/capybara/poltergeist/browser.rb b/lib/capybara/poltergeist/browser.rb
@@ -391,6 +391,10 @@ def go_forward
       command 'go_forward'
     end
 
+    def refresh
+      command 'refresh'
+    end
+
     def accept_confirm
       command 'set_confirm_process', true
     end

diff --git a/lib/capybara/poltergeist/client/browser.coffee b/lib/capybara/poltergeist/client/browser.coffee
@@ -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)

diff --git a/lib/capybara/poltergeist/client/compiled/browser.js b/lib/capybara/poltergeist/client/compiled/browser.js
@@ -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) : [];

diff --git a/lib/capybara/poltergeist/client/compiled/web_page.js b/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', 'render', 'close', 'renderBase64', 'goBack', 'goForward'];
+  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close', 'renderBase64', 'goBack', 'goForward', 'reload'];
 
   WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
 

diff --git a/lib/capybara/poltergeist/client/web_page.coffee b/lib/capybara/poltergeist/client/web_page.coffee
@@ -6,7 +6,7 @@ class Poltergeist.WebPage
                 'onClosing']
 
   @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close',
-                'renderBase64', 'goBack', 'goForward']
+                'renderBase64', 'goBack', 'goForward', 'reload']
 
   @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize',
                 'beforeUpload', 'afterUpload', 'clearLocalStorage']

diff --git a/lib/capybara/poltergeist/driver.rb b/lib/capybara/poltergeist/driver.rb
@@ -361,6 +361,10 @@ def go_forward
       browser.go_forward
     end
 
+    def refresh
+      browser.refresh
+    end
+
     def accept_modal(type, options = {})
       case type
       when :confirm