Merge pull request #11 from robertgates55/rga-useragent-mods

Resolved issue collecting userAgent on startup, and added user agent …

Author: robertgates55

pom.xml

@@ -135,6 +135,11 @@
       <artifactId>ngwebdriver</artifactId>
       <version>0.9.1</version>
     </dependency>
+      <dependency>
+          <groupId>net.sf.uadetector</groupId>
+          <artifactId>uadetector-resources</artifactId>
+          <version>2014.04</version>
+      </dependency>
   </dependencies>
 
   <repositories>

src/main/java/com/frameworkium/capture/model/Browser.java

@@ -1,6 +1,10 @@
 package com.frameworkium.capture.model;
 
 import com.frameworkium.config.SystemProperty;
+import com.frameworkium.tests.internal.BaseTest;
+import net.sf.uadetector.service.UADetectorServiceFactory;
+import net.sf.uadetector.UserAgentStringParser;
+import net.sf.uadetector.ReadableUserAgent;
 
 public class Browser {
     private String name;
@@ -10,20 +14,37 @@ public class Browser {
     private String platformVersion;
 
     public Browser() {
-        if (SystemProperty.BROWSER.isSpecified()) {
-            this.name = SystemProperty.BROWSER.getValue().toLowerCase();
-        }
-        if (SystemProperty.BROWSER_VERSION.isSpecified()) {
-            this.version = SystemProperty.BROWSER_VERSION.getValue();
-        }
-        if (SystemProperty.DEVICE.isSpecified()) {
-            this.device = SystemProperty.DEVICE.getValue();
-        }
-        if (SystemProperty.PLATFORM.isSpecified()) {
-            this.platform = SystemProperty.PLATFORM.getValue();
-        }
-        if (SystemProperty.PLATFORM_VERSION.isSpecified()) {
-            this.platformVersion = SystemProperty.PLATFORM_VERSION.getValue();
+
+
+        if(!BaseTest.userAgent.isEmpty()) {
+            // Get an UserAgentStringParser and analyze the requesting client
+            UserAgentStringParser parser = UADetectorServiceFactory.getResourceModuleParser();
+            ReadableUserAgent agent = parser.parse(BaseTest.userAgent);
+
+            //Set the params based on this agent
+            this.name = agent.getName();
+            this.version = agent.getVersionNumber().toVersionString();
+            this.device = agent.getDeviceCategory().getName();
+            this.platform = agent.getOperatingSystem().getName();
+            this.platformVersion = agent.getOperatingSystem().getVersionNumber().toVersionString();
+
+        } else {
+
+            if (SystemProperty.BROWSER.isSpecified()) {
+                this.name = SystemProperty.BROWSER.getValue().toLowerCase();
+            }
+            if (SystemProperty.BROWSER_VERSION.isSpecified()) {
+                this.version = SystemProperty.BROWSER_VERSION.getValue();
+            }
+            if (SystemProperty.DEVICE.isSpecified()) {
+                this.device = SystemProperty.DEVICE.getValue();
+            }
+            if (SystemProperty.PLATFORM.isSpecified()) {
+                this.platform = SystemProperty.PLATFORM.getValue();
+            }
+            if (SystemProperty.PLATFORM_VERSION.isSpecified()) {
+                this.platformVersion = SystemProperty.PLATFORM_VERSION.getValue();
+            }
         }
     }
 

src/main/java/com/frameworkium/listeners/CaptureListener.java

@@ -99,7 +99,9 @@ public void beforeNavigateTo(String url, WebDriver driver) {
 
     @Override
     public void beforeScript(String script, WebDriver driver) {
-        takeScreenshotAndSendToCapture("script", driver);
+        if(!script.contains("navigator.userAgent")){
+            takeScreenshotAndSendToCapture("script", driver);
+        }
     }
 
     /* Test end methods */