[jgitflow-maven-plugin] merging 'release/0.1.22' into 'master'

wcm-io-qa · Dec 17, 2018 · 55f727c · 55f727c
2 parents d10fa6d + 1fd66ee
commit 55f727c
Show file tree

Hide file tree

Showing 29 changed files with 216 additions and 78 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -31,7 +31,7 @@
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples</artifactId>
   <packaging>pom</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation examples.</description>
 
   <properties>

diff --git a/examples/specs/pom.xml b/examples/specs/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../../integration/specs</relativePath>
   </parent>
 
   <name>Galenium Example Specs</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
   <packaging>jar</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation example Galen specs.</description>
 
   <properties>

diff --git a/examples/tests/pom.xml b/examples/tests/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../../integration/ui-tests</relativePath>
   </parent>
 
   <name>Galenium Example Tests</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
   <packaging>jar</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation example tests.</description>
 
   <properties>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
 
   </dependencies>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -30,7 +30,7 @@
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration</artifactId>
   <packaging>pom</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation integration parent.</description>
 
   <modules>
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.logging</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
 
   </dependencies>
@@ -187,7 +187,7 @@
         <plugin>
           <groupId>io.wcm.qa</groupId>
           <artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
-          <version>0.1.20</version>
+          <version>0.1.22</version>
           <configuration>
             <packagePrefixSelectors>${galenium.generated.java.package.selectors}</packagePrefixSelectors>
             <packagePrefixSpecs>${galenium.generated.java.package.specs}</packagePrefixSpecs>

diff --git a/integration/resources/pom.xml b/integration/resources/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>..</relativePath>
   </parent>
 
   <name>Galenium Integration Resources</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
   <packaging>jar</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation integration resources.</description>
 
   <build>

diff --git a/integration/specs/pom.xml b/integration/specs/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>..</relativePath>
   </parent>
 
   <name>Galenium Integration Galen-Spec Parent</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
   <packaging>pom</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation integration parent for projects containing the Galen specs.</description>
 
   <dependencies>
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>io.wcm.qa</groupId>
         <artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
-        <version>0.1.20</version>
+        <version>0.1.22</version>
       </dependency>
 
     </dependencies>

diff --git a/integration/ui-tests/pom.xml b/integration/ui-tests/pom.xml
@@ -22,15 +22,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>..</relativePath>
   </parent>
 
   <name>Galenium Integration UI-Tests Parent</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
   <packaging>pom</packaging>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <description>Test automation integration parent for the actual UI tests.</description>
 
   <dependencies>
@@ -39,23 +39,23 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.icing</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.listeners</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.providers</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
 
   </dependencies>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.parent</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.core</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
 
     <dependency>

diff --git a/maven/archetype/pom.xml b/maven/archetype/pom.xml
@@ -22,13 +22,13 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.root</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.archetype</artifactId>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <name>wcm.io Archetype for Galenium</name>
   <packaging>maven-archetype</packaging>
   <url>http://maven.apache.org</url>

diff --git a/maven/specs-plugin/pom.xml b/maven/specs-plugin/pom.xml
@@ -4,15 +4,15 @@
   <parent>
     <artifactId>io.wcm.qa.galenium.parent</artifactId>
     <groupId>io.wcm.qa</groupId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <name>Galenium Galen Specs Maven Plugin</name>
   <description>Generates and packages Java classes from Galen specs.</description>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
-  <version>0.1.20</version>
+  <version>0.1.22</version>
   <packaging>maven-plugin</packaging>
 
   <url>http://qa.wcm.io/galenium/io.wcm.qa.galenium.specs-maven-plugin</url>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.galen</artifactId>
-      <version>0.1.20</version>
+      <version>0.1.22</version>
     </dependency>
 
     <!-- Utils -->

diff --git a/modules/core/changes.xml b/modules/core/changes.xml
@@ -23,6 +23,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="0.1.22" date="2018-12-17">
+      <action type="add" dev="pmannel">
+        Parameters to pass HTTPS proxy to webdriver.
+      </action>
+      <action type="update" dev="rdahlem">
+        Generated expected keys are sorted. Text comparison is in four-digit display to make it better sortable.
+      </action>
+    </release>
+
     <release version="0.1.20" date="2018-12-03">
       <action type="add" dev="apegam">
         Code generation now also generates GaleniumWebElements.

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.parent</artifactId>
-    <version>0.1.20</version>
+    <version>0.1.22</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/modules/core/src/main/java/io/wcm/qa/galenium/configuration/GaleniumConfiguration.java b/modules/core/src/main/java/io/wcm/qa/galenium/configuration/GaleniumConfiguration.java
@@ -66,6 +66,8 @@ public final class GaleniumConfiguration {
   private static final String SYSTEM_PROPERTY_NAME_HEADLESS = "galenium.headless";
   private static final String SYSTEM_PROPERTY_NAME_HTTP_PASS = "io.wcm.qa.http.pass";
   private static final String SYSTEM_PROPERTY_NAME_HTTP_USER = "io.wcm.qa.http.user";
+  private static final String SYSTEM_PROPERTY_NAME_HTTPS_PROXY_HOST = "galenium.webdriver.https.proxyHost";
+  private static final String SYSTEM_PROPERTY_NAME_HTTPS_PROXY_PORT = "galenium.webdriver.https.proxyPort";
   private static final String SYSTEM_PROPERTY_NAME_LAZY_DRIVER = "galenium.webdriver.lazy";
   private static final String SYSTEM_PROPERTY_NAME_MEDIA_QUERY_HEIGHT = "galenium.mediaquery.height";
   private static final String SYSTEM_PROPERTY_NAME_MEDIA_QUERY_PROPERTIES = "galenium.mediaquery.properties";
@@ -509,6 +511,56 @@ public static String getHttpPass() {
     return asString(SYSTEM_PROPERTY_NAME_HTTP_PASS);
   }
 
+  /**
+   * Https Proxy Host Configuration for Webdriver or BrowserMobProxy
+   * <ul>
+   * <li>Key:
+   *
+   * <pre>
+   * galenium.webdriver.https.proxyHost
+   * </pre>
+   *
+   * </li>
+   * <li>
+   * Default:
+   *
+   * <pre>
+   * null
+   * </pre>
+   *
+   * </li>
+   * </ul>
+   * @return null or https proxy host
+   */
+  public static String getHttpsProxyHost() {
+    return asString(SYSTEM_PROPERTY_NAME_HTTPS_PROXY_HOST, null);
+  }
+
+  /**
+   * Https Proxy Port Configuration for Webdriver or BrowserMobProxy
+   * <ul>
+   * <li>Key:
+   *
+   * <pre>
+   * galenium.webdriver.https.proxyPort
+   * </pre>
+   *
+   * </li>
+   * <li>
+   * Default:
+   *
+   * <pre>
+   * null
+   * </pre>
+   *
+   * </li>
+   * </ul>
+   * @return null or https proxy port
+   */
+  public static String getHttpsProxyPort() {
+    return asString(SYSTEM_PROPERTY_NAME_HTTPS_PROXY_PORT, null);
+  }
+
   /**
    * HTTP username to use in HTTP basic auth.
    * <ul>
@@ -841,6 +893,7 @@ public static boolean isChromeHeadlessWindowsWorkaround() {
     return asBoolean(SYSTEM_PROPERTY_NAME_CHROME_HEADLESS_WINDOWS_WORKAROUND);
   }
 
+
   /**
    * Headless Chrome Windows workaround flag.
    * <ul>
@@ -895,7 +948,6 @@ public static boolean isHeadless() {
     return asBoolean(SYSTEM_PROPERTY_NAME_HEADLESS);
   }
 
-
   /**
    * Lazy web driver intialization takes control away from WebDriverListener and lets the test itself decide
    * when or whether to initialize a webdriver.