From 3fc0c836a969171278504092b27e938d14cb8f69 Mon Sep 17 00:00:00 2001 From: Antonio Trindade Date: Tue, 18 Sep 2018 13:41:54 -0300 Subject: [PATCH] change driver to chrome, fixing dependencies in pom.xml for create report and fixes in specs. --- .gitignore | 4 + pom.xml | 147 ++++++++++-------- .../java/sample/components/GalenTestBase.java | 15 +- .../java/sample/tests/WelcomePageTest.java | 7 +- src/test/resources/specs/common.spec | 6 +- src/test/resources/specs/welcomePage.spec | 4 +- 6 files changed, 104 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 1ebf457..fb74947 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ target/ *.iml .idea/ +.classpath +.project +.settings/ +test-output/ diff --git a/pom.xml b/pom.xml index 3741dfd..d61bf3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,66 +1,87 @@ - - 4.0.0 - com.galenframework - galen-java-sample-tests - 0.1-SNAPSHOT - Galen Framework Sample Java Test Project - jar - A test project for testing Galen using Java-based tests - - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.testng - testng - 6.7 - test - - - com.galenframework - galen-java-support - 2.3.0 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - usedefaultlistenersfalse - - listener - com.galenframework.testng.GalenTestNgReportsListener - - - - - - + + 4.0.0 + com.galenframework + galen-java-sample-tests + 0.1-SNAPSHOT + Galen Framework Sample Java Test Project + jar + A test project for testing Galen using Java-based tests + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.testng + testng + 6.7 + test + + + com.galenframework + galen-java-support + 2.3.0 + + + com.fasterxml.jackson.core + jackson-annotations + 2.4.0 + + + + com.fasterxml.jackson.core + jackson-databind + 2.4.0 + + + + com.fasterxml.jackson.core + jackson-core + 2.4.0 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + + + usedefaultlisteners + false + + + listener + com.galenframework.testng.GalenTestNgReportsListener + + + + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + manual + + - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - manual - - - diff --git a/src/test/java/com/galenframework/java/sample/components/GalenTestBase.java b/src/test/java/com/galenframework/java/sample/components/GalenTestBase.java index 9832e44..98ed076 100644 --- a/src/test/java/com/galenframework/java/sample/components/GalenTestBase.java +++ b/src/test/java/com/galenframework/java/sample/components/GalenTestBase.java @@ -1,22 +1,23 @@ package com.galenframework.java.sample.components; -import com.galenframework.testng.GalenTestNgTestBase; +import static java.util.Arrays.asList; + +import java.util.List; + import org.openqa.selenium.Dimension; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.chrome.ChromeDriver; import org.testng.annotations.DataProvider; -import java.util.List; - -import static java.util.Arrays.asList; +import com.galenframework.testng.GalenTestNgTestBase; public abstract class GalenTestBase extends GalenTestNgTestBase { private static final String ENV_URL = "http://testapp.galenframework.com"; @Override - public WebDriver createDriver(Object[] args) { - WebDriver driver = new FirefoxDriver(); + public WebDriver createDriver(Object[] args) { + WebDriver driver = new ChromeDriver(); if (args.length > 0) { if (args[0] != null && args[0] instanceof TestDevice) { TestDevice device = (TestDevice)args[0]; diff --git a/src/test/java/com/galenframework/java/sample/tests/WelcomePageTest.java b/src/test/java/com/galenframework/java/sample/tests/WelcomePageTest.java index 4d4ca8c..83301f5 100644 --- a/src/test/java/com/galenframework/java/sample/tests/WelcomePageTest.java +++ b/src/test/java/com/galenframework/java/sample/tests/WelcomePageTest.java @@ -1,11 +1,11 @@ package com.galenframework.java.sample.tests; -import com.galenframework.java.sample.components.GalenTestBase; -import com.galenframework.java.sample.components.GalenTestBase; +import java.io.IOException; + import org.openqa.selenium.By; import org.testng.annotations.Test; -import java.io.IOException; +import com.galenframework.java.sample.components.GalenTestBase; public class WelcomePageTest extends GalenTestBase { @@ -22,5 +22,4 @@ public void loginPage_shouldLookGood_onDevice(TestDevice device) throws IOExcept getDriver().findElement(By.xpath("//button[.='Login']")).click(); checkLayout("/specs/loginPage.spec", device.getTags()); } - } diff --git a/src/test/resources/specs/common.spec b/src/test/resources/specs/common.spec index 8320ee6..8b483f6 100644 --- a/src/test/resources/specs/common.spec +++ b/src/test/resources/specs/common.spec @@ -60,7 +60,7 @@ @forEach [menu-item-*] as menuItem, prev as previousMenuItem ${menuItem}: - right-of ${previousMenuItem} 0 to 5px + right-of ${previousMenuItem} -1 to 4px aligned horizontally all ${previousMenuItem} @@ -74,7 +74,7 @@ @for [ 1, 3 ] as index menu-item-${index}: - near menu-item-${index + 1} 0 to 5 px left + near menu-item-${index + 1} -1 to 4px left = Content = @@ -91,5 +91,5 @@ = Footer = footer: - height ~ 200px + height ~ 150px below content 0px diff --git a/src/test/resources/specs/welcomePage.spec b/src/test/resources/specs/welcomePage.spec index 9a39e4a..292ee3e 100644 --- a/src/test/resources/specs/welcomePage.spec +++ b/src/test/resources/specs/welcomePage.spec @@ -19,12 +19,12 @@ text-block-1: height > 20px - above login-button 10 to 50 px + above login-button 60 to 130 px login-button: height ~ 45px text is "Login" - above text-block-3 10 to 50px + above text-block-3 -70 to 0px @on desktop