Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit 55f727c

Browse files
apegam-pvapegam-pv
committed
[jgitflow-maven-plugin] merging 'release/0.1.22' into 'master'
2 parents d10fa6d + 1fd66ee commit 55f727c

File tree

29 files changed

+216
-78
lines changed

29 files changed

+216
-78
lines changed

‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples</artifactId>
3333
<packaging>pom</packaging>
34-
<version>0.1.20</version>
34+
<version>0.1.22</version>
3535
<description>Test automation examples.</description>
3636

3737
<properties>

‎examples/specs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>../../integration/specs</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Specs</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
3333
<packaging>jar</packaging>
34-
<version>0.1.20</version>
34+
<version>0.1.22</version>
3535
<description>Test automation example Galen specs.</description>
3636

3737
<properties>

‎examples/tests/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>../../integration/ui-tests</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Tests</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
3333
<packaging>jar</packaging>
34-
<version>0.1.20</version>
34+
<version>0.1.22</version>
3535
<description>Test automation example tests.</description>
3636

3737
<properties>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm.qa</groupId>
4646
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
47-
<version>0.1.20</version>
47+
<version>0.1.22</version>
4848
</dependency>
4949

5050
</dependencies>

‎integration/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<groupId>io.wcm.qa</groupId>
3131
<artifactId>io.wcm.qa.galenium.integration</artifactId>
3232
<packaging>pom</packaging>
33-
<version>0.1.20</version>
33+
<version>0.1.22</version>
3434
<description>Test automation integration parent.</description>
3535

3636
<modules>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>io.wcm.qa</groupId>
109109
<artifactId>io.wcm.qa.galenium.logging</artifactId>
110-
<version>0.1.20</version>
110+
<version>0.1.22</version>
111111
</dependency>
112112

113113
</dependencies>
@@ -187,7 +187,7 @@
187187
<plugin>
188188
<groupId>io.wcm.qa</groupId>
189189
<artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
190-
<version>0.1.20</version>
190+
<version>0.1.22</version>
191191
<configuration>
192192
<packagePrefixSelectors>${galenium.generated.java.package.selectors}</packagePrefixSelectors>
193193
<packagePrefixSpecs>${galenium.generated.java.package.specs}</packagePrefixSpecs>

‎integration/resources/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<name>Galenium Integration Resources</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
3333
<packaging>jar</packaging>
34-
<version>0.1.20</version>
34+
<version>0.1.22</version>
3535
<description>Test automation integration resources.</description>
3636

3737
<build>

‎integration/specs/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<name>Galenium Integration Galen-Spec Parent</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
3333
<packaging>pom</packaging>
34-
<version>0.1.20</version>
34+
<version>0.1.22</version>
3535
<description>Test automation integration parent for projects containing the Galen specs.</description>
3636

3737
<dependencies>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>io.wcm.qa</groupId>
5353
<artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
54-
<version>0.1.20</version>
54+
<version>0.1.22</version>
5555
</dependency>
5656

5757
</dependencies>

‎integration/ui-tests/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<parent>
2323
<groupId>io.wcm.qa</groupId>
2424
<artifactId>io.wcm.qa.galenium.integration</artifactId>
25-
<version>0.1.20</version>
25+
<version>0.1.22</version>
2626
<relativePath>..</relativePath>
2727
</parent>
2828

2929
<name>Galenium Integration UI-Tests Parent</name>
3030
<groupId>io.wcm.qa</groupId>
3131
<artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
3232
<packaging>pom</packaging>
33-
<version>0.1.20</version>
33+
<version>0.1.22</version>
3434
<description>Test automation integration parent for the actual UI tests.</description>
3535

3636
<dependencies>
@@ -39,23 +39,23 @@
3939
<dependency>
4040
<groupId>io.wcm.qa</groupId>
4141
<artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
42-
<version>0.1.20</version>
42+
<version>0.1.22</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
4646
<groupId>io.wcm.qa</groupId>
4747
<artifactId>io.wcm.qa.galenium.icing</artifactId>
48-
<version>0.1.20</version>
48+
<version>0.1.22</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>io.wcm.qa</groupId>
5252
<artifactId>io.wcm.qa.galenium.listeners</artifactId>
53-
<version>0.1.20</version>
53+
<version>0.1.22</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>io.wcm.qa</groupId>
5757
<artifactId>io.wcm.qa.galenium.providers</artifactId>
58-
<version>0.1.20</version>
58+
<version>0.1.22</version>
5959
</dependency>
6060

6161
</dependencies>

‎logging/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.parent</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>../parent/pom.xml</relativePath>
2828
</parent>
2929

@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>io.wcm.qa</groupId>
3939
<artifactId>io.wcm.qa.galenium.core</artifactId>
40-
<version>0.1.20</version>
40+
<version>0.1.22</version>
4141
</dependency>
4242

4343
<dependency>

‎maven/archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>io.wcm.qa</groupId>
2424
<artifactId>io.wcm.qa.galenium.root</artifactId>
25-
<version>0.1.20</version>
25+
<version>0.1.22</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

2929
<groupId>io.wcm.qa</groupId>
3030
<artifactId>io.wcm.qa.galenium.archetype</artifactId>
31-
<version>0.1.20</version>
31+
<version>0.1.22</version>
3232
<name>wcm.io Archetype for Galenium</name>
3333
<packaging>maven-archetype</packaging>
3434
<url>http://maven.apache.org</url>

‎maven/specs-plugin/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<parent>
55
<artifactId>io.wcm.qa.galenium.parent</artifactId>
66
<groupId>io.wcm.qa</groupId>
7-
<version>0.1.20</version>
7+
<version>0.1.22</version>
88
<relativePath>../../parent/pom.xml</relativePath>
99
</parent>
1010

1111
<name>Galenium Galen Specs Maven Plugin</name>
1212
<description>Generates and packages Java classes from Galen specs.</description>
1313
<groupId>io.wcm.qa</groupId>
1414
<artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
15-
<version>0.1.20</version>
15+
<version>0.1.22</version>
1616
<packaging>maven-plugin</packaging>
1717

1818
<url>http://qa.wcm.io/galenium/io.wcm.qa.galenium.specs-maven-plugin</url>
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>io.wcm.qa</groupId>
4141
<artifactId>io.wcm.qa.galenium.galen</artifactId>
42-
<version>0.1.20</version>
42+
<version>0.1.22</version>
4343
</dependency>
4444

4545
<!-- Utils -->

‎modules/core/changes.xml

+9
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="0.1.22" date="2018-12-17">
27+
<action type="add" dev="pmannel">
28+
Parameters to pass HTTPS proxy to webdriver.
29+
</action>
30+
<action type="update" dev="rdahlem">
31+
Generated expected keys are sorted. Text comparison is in four-digit display to make it better sortable.
32+
</action>
33+
</release>
34+
2635
<release version="0.1.20" date="2018-12-03">
2736
<action type="add" dev="apegam">
2837
Code generation now also generates GaleniumWebElements.

‎modules/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.parent</artifactId>
26-
<version>0.1.20</version>
26+
<version>0.1.22</version>
2727
<relativePath>../../parent/pom.xml</relativePath>
2828
</parent>
2929

‎modules/core/src/main/java/io/wcm/qa/galenium/configuration/GaleniumConfiguration.java

+53-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ public final class GaleniumConfiguration {
6666
private static final String SYSTEM_PROPERTY_NAME_HEADLESS = "galenium.headless";
6767
private static final String SYSTEM_PROPERTY_NAME_HTTP_PASS = "io.wcm.qa.http.pass";
6868
private static final String SYSTEM_PROPERTY_NAME_HTTP_USER = "io.wcm.qa.http.user";
69+
private static final String SYSTEM_PROPERTY_NAME_HTTPS_PROXY_HOST = "galenium.webdriver.https.proxyHost";
70+
private static final String SYSTEM_PROPERTY_NAME_HTTPS_PROXY_PORT = "galenium.webdriver.https.proxyPort";
6971
private static final String SYSTEM_PROPERTY_NAME_LAZY_DRIVER = "galenium.webdriver.lazy";
7072
private static final String SYSTEM_PROPERTY_NAME_MEDIA_QUERY_HEIGHT = "galenium.mediaquery.height";
7173
private static final String SYSTEM_PROPERTY_NAME_MEDIA_QUERY_PROPERTIES = "galenium.mediaquery.properties";
@@ -509,6 +511,56 @@ public static String getHttpPass() {
509511
return asString(SYSTEM_PROPERTY_NAME_HTTP_PASS);
510512
}
511513

514+
/**
515+
* Https Proxy Host Configuration for Webdriver or BrowserMobProxy
516+
* <ul>
517+
* <li>Key:
518+
*
519+
* <pre>
520+
* galenium.webdriver.https.proxyHost
521+
* </pre>
522+
*
523+
* </li>
524+
* <li>
525+
* Default:
526+
*
527+
* <pre>
528+
* null
529+
* </pre>
530+
*
531+
* </li>
532+
* </ul>
533+
* @return null or https proxy host
534+
*/
535+
public static String getHttpsProxyHost() {
536+
return asString(SYSTEM_PROPERTY_NAME_HTTPS_PROXY_HOST, null);
537+
}
538+
539+
/**
540+
* Https Proxy Port Configuration for Webdriver or BrowserMobProxy
541+
* <ul>
542+
* <li>Key:
543+
*
544+
* <pre>
545+
* galenium.webdriver.https.proxyPort
546+
* </pre>
547+
*
548+
* </li>
549+
* <li>
550+
* Default:
551+
*
552+
* <pre>
553+
* null
554+
* </pre>
555+
*
556+
* </li>
557+
* </ul>
558+
* @return null or https proxy port
559+
*/
560+
public static String getHttpsProxyPort() {
561+
return asString(SYSTEM_PROPERTY_NAME_HTTPS_PROXY_PORT, null);
562+
}
563+
512564
/**
513565
* HTTP username to use in HTTP basic auth.
514566
* <ul>
@@ -841,6 +893,7 @@ public static boolean isChromeHeadlessWindowsWorkaround() {
841893
return asBoolean(SYSTEM_PROPERTY_NAME_CHROME_HEADLESS_WINDOWS_WORKAROUND);
842894
}
843895

896+
844897
/**
845898
* Headless Chrome Windows workaround flag.
846899
* <ul>
@@ -895,7 +948,6 @@ public static boolean isHeadless() {
895948
return asBoolean(SYSTEM_PROPERTY_NAME_HEADLESS);
896949
}
897950

898-
899951
/**
900952
* Lazy web driver intialization takes control away from WebDriverListener and lets the test itself decide
901953
* when or whether to initialize a webdriver.

0 commit comments

Comments
 (0)