Firefox: Implementing ability to return non-boolean capabilities

thees · Feb 4, 2016 · c09fa0e · c09fa0e
1 parent 0181ae5
commit c09fa0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/javascript/firefox-driver/js/nsCommandProcessor.js b/javascript/firefox-driver/js/nsCommandProcessor.js
@@ -757,9 +757,14 @@ nsCommandProcessor.prototype.getSessionCapabilities = function(response) {
     try {
       response.value[cap] = prefStore.getBoolPref(pref);
     } catch (e) {
-      // An exception is thrown if the saught preference is not available.
-      // For instance, a Firefox version not supporting HTML5 will not have
-      // a preference for webStorageEnabled.
+      try {
+        response.value[cap] = prefStore.getIntPref(pref);
+      } catch (e) {
+        try {
+          response.value[cap] = prefStore.getCharPref(pref);
+        } catch (e) {
+        }
+      }
     }
   }
 

diff --git a/javascript/firefox-driver/js/sessionstore.js b/javascript/firefox-driver/js/sessionstore.js
@@ -166,6 +166,7 @@ wdSessionStoreService.CAPABILITY_PREFERENCE_MAPPING = {
   'webStorageEnabled': 'dom.storage.enabled',
   'applicationCacheEnabled': 'browser.cache.offline.enable',
   'databaseEnabled': 'dom.indexedDB.enabled',
+  'elementScrollBehavior' : 'webdriver.elementScrollBehavior',
   'locationContextEnabled': 'geo.enabled',
   'browserConnectionEnabled': 'dom.network.enabled',
   'acceptSslCerts': 'webdriver_accept_untrusted_certs',