Changing capability name from pageLoadingStrategy to pageLoadStrategy

Author: barancev

Diff for: java/client/src/org/openqa/selenium/remote/CapabilityType.java

@@ -46,7 +46,12 @@ public interface CapabilityType {
 
   String ENABLE_PROFILING_CAPABILITY = "webdriver.logging.profiler.enabled";
 
+  /**
+   * @deprecated Use PAGE_LOAD_STRATEGY instead
+   */
+  @Deprecated
   String PAGE_LOADING_STRATEGY = "pageLoadingStrategy";
+  String PAGE_LOAD_STRATEGY = "pageLoadStrategy";
 
   /**
    * Moved InternetExplorer specific CapabilityTypes into InternetExplorerDriver.java for consistency

Diff for: java/client/test/org/openqa/selenium/PageLoadingTest.java

@@ -75,7 +75,7 @@ private void initLocalDriver(String strategy) {
       localDriver.quit();
     }
     DesiredCapabilities caps = new DesiredCapabilities();
-    caps.setCapability(CapabilityType.PAGE_LOADING_STRATEGY, strategy);
+    caps.setCapability(CapabilityType.PAGE_LOAD_STRATEGY, strategy);
     localDriver = new WebDriverBuilder().setDesiredCapabilities(caps).get();
   }
 

Diff for: javascript/firefox-driver/js/firefoxDriver.js

@@ -42,11 +42,11 @@ goog.require('goog.math.Coordinate');
 goog.require('goog.math.Size');
 
 
-FirefoxDriver = function(server, enableNativeEvents, win, opt_pageLoadingStrategy) {
+FirefoxDriver = function(server, enableNativeEvents, win, opt_pageLoadStrategy) {
   this.server = server;
   this.enableNativeEvents = enableNativeEvents;
   this.window = win;
-  this.pageLoadingStrategy = opt_pageLoadingStrategy || 'normal';
+  this.pageLoadStrategy = opt_pageLoadStrategy || 'normal';
 
   // Default to a two second timeout.
   this.alertTimeout = 2000;

Diff for: javascript/firefox-driver/js/nsCommandProcessor.js

@@ -510,12 +510,12 @@ nsCommandProcessor.prototype.execute = function(jsonCommandString,
   }
 
   // TODO: should we delay commands if the page is reloaded on itself?
-//  var pageLoadingTimeout = response.session.getPageLoadTimeout();
+//  var pageLoadTimeout = response.session.getPageLoadTimeout();
 //  var shouldWaitForPageLoad = response.session.getWaitForPageLoad();
-//  if (pageLoadingTimeout != 0 && shouldWaitForPageLoad) {
+//  if (pageLoadTimeout != 0 && shouldWaitForPageLoad) {
 //    driver.window.setTimeout(function () {
 //      response.session.setWaitForPageLoad(false);
-//    }, pageLoadingTimeout);
+//    }, pageLoadTimeout);
 //  }
 
   response.startCommand(sessionWindow);

Diff for: javascript/firefox-driver/js/sessionstore.js

@@ -171,7 +171,8 @@ wdSessionStoreService.CAPABILITY_PREFERENCE_MAPPING = {
   'browserConnectionEnabled': 'dom.network.enabled',
   'acceptSslCerts': 'webdriver_accept_untrusted_certs',
   'nativeEvents' : 'webdriver_enable_native_events',
-  'pageLoadingStrategy' : 'webdriver.load.strategy'
+  'pageLoadingStrategy' : 'webdriver.load.strategy',
+  'pageLoadStrategy' : 'webdriver.load.strategy'
 };
 // TODO: Don't save firefox specific capability acceptSslCerts as preferences.
 

Diff for: javascript/firefox-driver/js/utils.js

@@ -258,7 +258,7 @@ Utils.useNativeEvents = function() {
   return !!(enableNativeEvents && Utils.getNativeEvents());
 };
 
-Utils.getPageLoadingStrategy = function() {
+Utils.getPageLoadStrategy = function() {
   var prefs =
       fxdriver.moz.getService('@mozilla.org/preferences-service;1', 'nsIPrefBranch');
   return prefs.prefHasUserValue('webdriver.load.strategy') ?

Diff for: javascript/firefox-driver/js/webLoadingListener.js

@@ -192,7 +192,7 @@ var prefs = Components.classes['@mozilla.org/preferences-service;1']
  * @return {!nsIWebProgressListener} The new listener.
  */
 function buildHandler(browser, toCall, opt_window) {
-  var strategy = Utils.getPageLoadingStrategy();
+  var strategy = Utils.getPageLoadStrategy();
   if ('normal' == strategy) {
     return new PatientListener(browser, toCall, opt_window);
   }
@@ -218,7 +218,7 @@ var loadingListenerTimer;
  * @constructor
  */
 WebLoadingListener = function(browser, toCall, timeout, opt_window) {
-  var strategy = Utils.getPageLoadingStrategy();
+  var strategy = Utils.getPageLoadStrategy();
   if ('none' == strategy) {
     toCall(false, true);
     return;