wcm-io-qa · apegam-pv · Dec 31, 2019 · Sep 30, 2019 · Sep 30, 2019 · Sep 30, 2019
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ npm-debug.log
 *.swp
 example-project/chromedriver.log
 *.log
+.allure
+bin/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.0.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+  rev: v1.0.0
+  hooks:
+      - id: commitlint
+        stages: [commit-msg]
diff --git a/README.md b/README.md
@@ -1,11 +1,10 @@
 <img src="https://wcm.io/images/[email protected]"/> Selenium Galen Integration
 ==========================
-[![Build Status](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium.png?branch=develop)](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium) 
+[![Build Status](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium.png?branch=develop)](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium)
 
 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 [documentation].
 
 
 [documentation]: https://qa.wcm.io/galenium/
-
diff --git a/commitlint.config.js b/commitlint.config.js
@@ -0,0 +1,35 @@
+module.exports = {
+	rules: {
+		'body-leading-blank': [1, 'always'],
+		'footer-leading-blank': [1, 'always'],
+		'header-max-length': [2, 'always', 72],
+		'body-max-line-length': [2, 'always', 80],
+		'scope-case': [2, 'always', 'lower-case'],
+		'subject-case': [
+			2,
+			'never',
+			['sentence-case', 'start-case', 'pascal-case', 'upper-case']
+		],
+		'subject-empty': [2, 'never'],
+		'subject-full-stop': [2, 'never', '.'],
+		'type-case': [2, 'always', 'lower-case'],
+		'type-empty': [2, 'never'],
+		'type-enum': [
+			2,
+			'always',
+			[
+				'build',
+				'chore',
+				'ci',
+				'docs',
+				'feat',
+				'fix',
+				'perf',
+				'refactor',
+				'revert',
+				'style',
+				'test'
+			]
+		]
+	}
+};
diff --git a/examples/baseline/pom.xml b/examples/baseline/pom.xml
@@ -22,15 +22,13 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>3.0.0</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../integration</relativePath>
   </parent>
 
   <name>Galenium Example Baseline</name>
-  <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.baseline</artifactId>
   <packaging>pom</packaging>
-  <version>3.0.0</version>
   <description>Test automation example baseline.</description>
 
   <properties>
@@ -46,12 +44,11 @@
       <dependency>
         <groupId>io.wcm.qa</groupId>
         <artifactId>io.wcm.qa.galenium.examples.samples</artifactId>
-        <version>3.0.0</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
-
   <build>
     <plugins>
 

diff --git a/examples/baseline/src/changes/changes.xml b/examples/baseline/src/changes/changes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  wcm.io
+  %%
+  Copyright (C) 2017 wcm.io
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/changes/1.0.0"
+  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>
+
+  </body>
+</document>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -16,8 +16,9 @@
   limitations under the License.
   #L%
   -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -28,10 +29,9 @@
   </parent>
 
   <name>Galenium Examples</name>
-  <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <version>3.0.0</version>
   <description>Test automation examples.</description>
 
   <properties>
@@ -63,5 +63,5 @@
       </distributionManagement>
     </profile>
   </profiles>
-      
+
 </project>
diff --git a/examples/samples/pom.xml b/examples/samples/pom.xml
@@ -16,21 +16,22 @@
   limitations under the License.
   #L%
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>3.0.0</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../integration</relativePath>
   </parent>
 
   <name>Galenium Example Samples</name>
-  <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.samples</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0</version>
+  <version>4.0.0-SNAPSHOT</version>
   <description>Test automation example samples.</description>
 
   <properties>
@@ -43,7 +44,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
 
@@ -64,13 +65,13 @@
             </goals>
             <configuration>
               <outputDirectory>${basedir}/target/classes</outputDirectory>
-              <resources>          
+              <resources>
                 <resource>
                   <directory>${galenium.sampling.root}</directory>
                   <filtering>false</filtering>
                 </resource>
-              </resources>              
-            </configuration>            
+              </resources>
+            </configuration>
           </execution>
         </executions>
       </plugin>

diff --git a/examples/samples/src/changes/changes.xml b/examples/samples/src/changes/changes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  wcm.io
+  %%
+  Copyright (C) 2017 wcm.io
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/changes/1.0.0"
+  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>
+
+  </body>
+</document>
diff --git a/examples/scripts/maven-call.sh b/examples/scripts/maven-call.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+echo "initializing maven args functions";
+
+function addProfile() {
+  addArg "-P${1}";
+}
+
+function addTests() {
+  for TEST in $@;
+  do
+    addTest "${TEST}";
+  done
+}
+
+function addTest() {
+  if [ -z "${MRW_TESTS}" ];
+  then
+    MRW_TESTS="${1}";
+  else
+    MRW_TESTS="${MRW_TESTS},${1}";
+  fi
+}
+
+function addGoal() {
+  MAVEN_GOALS="${MAVEN_GOALS} ${1}";
+}
+
+function addDef() {
+  addArg "-D${1}";
+}
+
+function addArg() {
+  MRW_MAVEN_ARGS="${MRW_MAVEN_ARGS} ${1}";
+}
+
+echo "Checking local settings at: '${LOCAL_SETTINGS}'";
+if [ -f "${LOCAL_SETTINGS}" ];
+then
+  echo "using local settings";
+  source "${LOCAL_SETTINGS}";
+else
+  echo "no local settings found";
+fi
+
+MRW_MAVEN_CALL="mvn ${MAVEN_GOALS}";
+MRW_MAVEN_CALL="${MRW_MAVEN_CALL} ${MRW_MAVEN_ARGS}";
+if [ -n "${MRW_TESTS}" ];
+then
+  MRW_MAVEN_CALL="${MRW_MAVEN_CALL} -Dit.test=${MRW_TESTS} ${@}";
+fi
+
+echo "Calling: '${MRW_MAVEN_CALL}'";
+${MRW_MAVEN_CALL};
diff --git a/examples/specs/pom.xml b/examples/specs/pom.xml
@@ -16,22 +16,21 @@
   limitations under the License.
   #L%
   -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
-    <version>3.0.0</version>
+    <version>4.0.0-SNAPSHOT</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>3.0.0</version>
   <description>Test automation example Galen specs.</description>
 
   <properties>

diff --git a/examples/specs/src/changes/changes.xml b/examples/specs/src/changes/changes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  wcm.io
+  %%
+  Copyright (C) 2017 wcm.io
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/changes/1.0.0"
+  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>
+
+  </body>
+</document>
diff --git a/examples/specs/src/main/resources/galen/specs/common.gspec b/examples/specs/src/main/resources/galen/specs/common.gspec
@@ -3,7 +3,6 @@
       site-header             header.header-site
       navigation              nav#nav-main
           link-*              ul.navlist > li > a
-          link-to-conference  li > a[href$="conference.html"]
           link-to-homepage    li > a[href$="en.html"]
           menu-opener         a.menu-opener
       footer                  footer.footer-site

diff --git a/examples/specs/src/main/resources/galen/specs/conference.gspec b/examples/specs/src/main/resources/galen/specs/conference.gspec
@@ -8,8 +8,6 @@
         @on mobile
             page.navigation.link-*:
                 absent
-            page.navigation.link-to-conference:
-                absent
             page.navigation.link-to-homepage:
                 absent
 

diff --git a/examples/specs/src/main/resources/galen/specs/homepage.gspec b/examples/specs/src/main/resources/galen/specs/homepage.gspec
@@ -17,8 +17,6 @@
         @on mobile
             page.navigation.link-*:
                 absent
-            page.navigation.link-to-conference:
-                absent
             page.navigation.link-to-homepage:
                 absent
 
@@ -36,7 +34,7 @@
             below page.navigation
             below page.site-header
         article:
-            above page.footer 
+            above page.footer
         teaserbar:
             above page.footer ~ 0px
     = Containment =
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,3 +28,5 @@ npm-debug.log @@
     *.swp
     example-project/chromedriver.log
     *.log
+    .allure
+    bin/