Setting default values for capsbilities

bowdev · Feb 28, 2014 · c350977 · c350977
1 parent cd2c55b
commit c350977
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/arrow_selenium/selLib.js b/arrow_selenium/selLib.js
@@ -170,6 +170,13 @@ SelLib.prototype.getCapabilityObject = function(capabilities, browser) {
             logger.fatal("Capability " + capabilities + " does not contain related information for " + browserInfo.browserName);
             process.exit(1);
         }
+
+        // Set default values for capabilities, if not passed by user
+        capabilities.version = browserInfo.browserVersion ? browserInfo.browserVersion : "latest";
+        capabilities.platform = capabilities.platform ? capabilities.platform : "ANY";
+        capabilities.javascriptEnabled = capabilities.javascriptEnabled ? capabilities.javascriptEnabled : true;
+        capabilities.seleniumProtocol = capabilities.seleniumProtocol ? capabilities.seleniumProtocol : "WebDriver";
+
     } else {
         // default capabilities
         capabilities = {

diff --git a/lib/util/arrowsetup.js b/lib/util/arrowsetup.js
@@ -600,22 +600,24 @@ ArrowSetup.prototype.setupBrowserForReuse = function(cb) {
 
         self.logger.fatal("browser=reuse is being deprecated. Please use --reuseSession=true --browser=firefox (for e.g) ")
         self.argv.reuseSession = true;
+        self.logger.info('Browser is reuse. Setting reuseSession to true');
 
         if (!self.argv.driver) {
             self.argv.driver = "selenium";
         }
 
-        self.logger.trace('setupBrowserForReuse ends');
-        cb();
     }
 
-    if (self.argv.reuseSession) {
+    if (self.argv.reuseSession == true) {
 
         if ("reuse" === self.argv.browser || "reuse-" === self.argv.browser) {
+            self.logger.info('Browser is reuse. ReuseSession to true. Not opening browsers');
+            self.logger.trace('setupBrowserForReuse ends');
             if (cb) {
                 cb();
             }
         } else {
+            self.logger.info('Browser is NOT reuse. Opening browsers');
             BrowserManager.openBrowsers(self.argv.browser, self.config, self.argv.capabilities, function() {
                 self.logger.trace('setupBrowserForReuse ends');
                 if (cb) {

diff --git a/lib/util/capabilitymanager.js b/lib/util/capabilitymanager.js
@@ -27,6 +27,7 @@ CapabilityManager.prototype.getCapability = function (capJsonPath, capName) {
         capJson = JSON.parse(fs.readFileSync(capJsonPath, "utf-8"));
         cap = clone(capJson.capabilities[capName]);
         commonCap = capJson.common_capabilities;
+        console.log('***capName::' + JSON.stringify(capName));
         console.log('***Capjson::' + JSON.stringify(capJson));
         console.log('***cap::' + JSON.stringify(cap));
         console.log('***commonCap::' + JSON.stringify(commonCap));
@@ -90,6 +91,7 @@ CapabilityManager.prototype.getCapabilities = function (args, config) {
     }
 
     browserInfo = caps.browserName.split("-", 2);
+    console.log('****BrowserInfo::' + JSON.stringify(browserInfo));
 
     if (browserInfo.length > 1) {
         browserName = browserInfo[0];

diff --git a/tests/unit/arrow_selenium/selLib-tests.js b/tests/unit/arrow_selenium/selLib-tests.js
@@ -44,7 +44,7 @@ YUI.add('selLib-tests', function (Y, NAME) {
             caps = selLib.getCapabilityObject(path.join(arrowRoot, "/tests/unit/arrow_selenium/caps.json"), "firefox");
 
             A.isNotNull(caps, "Caps is null");
-            A.areEqual("{\"browserName\":\"firefox\",\"version\":\"\",\"platform\":\"ANY\",\"javascriptEnabled\":true}", JSON.stringify(caps), 'Capability doesnt match');
+            A.areEqual("{\"browserName\":\"firefox\",\"version\":\"latest\",\"platform\":\"ANY\",\"javascriptEnabled\":true,\"seleniumProtocol\":\"WebDriver\"}", JSON.stringify(caps), 'Capability doesnt match');
         },
 
         'test get browser info': function () {