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

Author: apegam-pv

.travis.yml

@@ -20,15 +20,16 @@
 language: java
 
 jdk:
-  - oraclejdk8
+- oraclejdk8
+- openjdk11
 
 # Make sure travis can use container-based infrastructure
 sudo: false
 
 install: "mvn -s ./.travis.maven-settings.xml clean"
 
 script:
-- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install"
+- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install"
 # Remove wcm.io artefacts from repository before cache
 - rm -rf $HOME/.m2/repository/io/wcm
 

README.md

@@ -4,10 +4,8 @@
 
 This project is an attempt to integrate Galen with Selenium and the other way around in a Maven project. It uses TestNG as a test runner. Galen and ExtentReports provide the reporting.
 
-To get an idea how it works, take a look at the [example projects] and test examples.
+To get an idea how it works, take a look at the [documentation].
 
- To integrate into your project you inherit from the [spec generation] and [UI testing] POMs.
 
-[example projects]: examples
-[spec generation]: integration/specs
-[UI testing]: integration/ui-tests
+[documentation]: http://qa.wcm.io/galenium/
+

examples/pom.xml

@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>23</version>
+    <version>25</version>
     <relativePath />
   </parent>
 
   <name>Galenium Examples</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples</artifactId>
   <packaging>pom</packaging>
-  <version>0.1.22</version>
+  <version>1.0.0</version>
   <description>Test automation examples.</description>
 
   <properties>

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.22</version>
+    <version>1.0.0</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.22</version>
+  <version>1.0.0</version>
   <description>Test automation example Galen specs.</description>
 
   <properties>

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.22</version>
+    <version>1.0.0</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.22</version>
+  <version>1.0.0</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.22</version>
+      <version>1.0.0</version>
     </dependency>
 
   </dependencies>

examples/tests/src/main/java/io/wcm/qa/galenium/example/AbstractExampleBase.java

@@ -19,8 +19,6 @@
  */
 package io.wcm.qa.galenium.example;
 
-import static io.wcm.qa.galenium.util.GaleniumContext.getDriver;
-
 import io.wcm.qa.galenium.device.TestDevice;
 import io.wcm.qa.galenium.example.selectors.common.Page;
 import io.wcm.qa.galenium.example.selectors.common.Page.Navigation;
@@ -52,11 +50,6 @@ private void navShouldBeVisible() {
     Element.findOrFail(Page.NAVIGATION);
   }
 
-  protected void assertRelativePath(String relativePath) {
-    String currentUrl = getDriver().getCurrentUrl();
-    assertEquals(currentUrl, getBaseUrl() + relativePath, "relative path should be: '" + relativePath + "'");
-  }
-
   protected void clickConferenceNavLink() {
     Navigation.LINK_TO_CONFERENCE.click();
   }

examples/tests/src/test/java/io/wcm/qa/galenium/example/ImageComparisonIT.java

@@ -74,7 +74,10 @@ private void checkVisually(Selector selector) {
         getDevice(),
         GalenHelperUtil.getSectionFilter(getDevice()),
         getValidationListener());
-    handleLayoutReport("image_comparison_" + selector.elementName() + ".gspec", layoutReport);
+    String specName = "image_comparison_" + selector.elementName() + ".gspec";
+    String errorMessage = "FAILED: Layoutcheck " + specName + " with device " + getDevice();
+    String successMessage = "successfully ran spec: " + specName;
+    GalenLayoutChecker.handleLayoutReport(layoutReport, errorMessage, successMessage);
   }
 
   private ImageComparisonValidationListener getValidationListener() {

examples/tests/src/test/java/io/wcm/qa/galenium/example/NavigationIT.java

@@ -25,6 +25,8 @@
 import io.wcm.qa.galenium.device.TestDevice;
 import io.wcm.qa.galenium.providers.TestDeviceProvider;
 import io.wcm.qa.galenium.util.BrowserUtil;
+import io.wcm.qa.galenium.verification.driver.TitleAndUrlVerification;
+import io.wcm.qa.galenium.verification.util.Check;
 
 /**
  * Example for pure Selenium test based on Galenium.
@@ -54,7 +56,7 @@ public void testNavigation() {
         getLogger().debug("exception when sleeping after click", ex);
       }
     }
-    assertRelativePath(PATH_TO_CONFERENCE_PAGE);
+    Check.verify(new TitleAndUrlVerification("conference"));
   }
 
 }

examples/tests/src/test/java/io/wcm/qa/galenium/example/PageObjectIT.java

@@ -35,6 +35,7 @@
 import io.wcm.qa.galenium.example.pageobjects.Stage;
 import io.wcm.qa.galenium.interaction.Aem;
 import io.wcm.qa.galenium.providers.TestDeviceProvider;
+import io.wcm.qa.galenium.util.GaleniumContext;
 
 /**
  * Showcase page object approach.
@@ -64,6 +65,14 @@ public void testWithPageObjects() {
     checkFooter();
   }
 
+  private void assertEquals(int actual, int expected, String msg) {
+    GaleniumContext.getAssertion().assertEquals(actual, expected, msg);
+  }
+
+  private void assertEquals(String actual, String expected, String msg) {
+    GaleniumContext.getAssertion().assertEquals(actual, expected, msg);
+  }
+
   private void checkFooter() {
     Footer footer = getHomepage().getFooter();
     List<FooterNavSection> navSections = footer.getNavSections();