Skip to content

Commit

Permalink
Release 1.9-RC3
Browse files Browse the repository at this point in the history
Fix Javadoc issues
Remove Applitools integration
  • Loading branch information
martinschneider authored Sep 22, 2020
1 parent 5690a31 commit 7ab8e2f
Show file tree
Hide file tree
Showing 29 changed files with 25 additions and 309 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '10', '11', '12', '13' ]
java: [ '10', '11', '12', '13', '14' ]
os: [ubuntu-latest]

steps:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,6 @@ $RECYCLE.BIN/
**/build/**

node_modules/

.firebase/

66 changes: 0 additions & 66 deletions justtestlah-applitools/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions justtestlah-applitools/src/main/resources/logback.xml

This file was deleted.

19 changes: 0 additions & 19 deletions justtestlah-applitools/src/test/resources/logback-test.xml

This file was deleted.

2 changes: 1 addition & 1 deletion justtestlah-awsdevicefarm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion justtestlah-browserstack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion justtestlah-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand Down
30 changes: 1 addition & 29 deletions justtestlah-core/src/main/java/qa/justtestlah/base/BasePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import qa.justtestlah.log.LogLevel;
import qa.justtestlah.log.TestLogWriter;
import qa.justtestlah.stubs.AppiumTemplateMatcher;
import qa.justtestlah.stubs.Applitools;
import qa.justtestlah.stubs.Galen;
import qa.justtestlah.stubs.Match;
import qa.justtestlah.stubs.OCR;
Expand All @@ -50,8 +49,6 @@ public abstract class BasePage<T> extends Base {

@Autowired private LocatorPlaceholders globalPlaceholders;

@Autowired private Applitools applitools;

@Autowired private Galen galen;

@Autowired private OCR ocr;
Expand Down Expand Up @@ -162,29 +159,6 @@ private void loadLocators(String fileName) {
locators = new LocatorMap(locatorParser.parse(fileName), globalPlaceholders.getProps());
}

/**
* Performs visual checks using Applitools.
*
* @return this
*/
@SuppressWarnings("unchecked")
private T checkWindow() {
if (configuration.isEyesEnabled()) {
logWriter.log(
LogLevel.INFO,
TestLogWriter.WEBDRIVER_INDENTATION,
"Performing visual checks on class {}",
this.getClass().getSimpleName());
applitools.checkWindow();
} else {
LOG.debug(
"Eyes disabled, skipping check on class {}. You can enable visual testing with "
+ "Applitools Eyes by setting eyes.enabled = true in justtestlah.properties.",
this.getClass().getSimpleName());
}
return (T) this;
}

/**
* Performs layout checks using Galen.
*
Expand Down Expand Up @@ -226,7 +200,7 @@ public T verify() {
* Verifies, that all UI elements defined for the given page object using {@link ScreenIdentifier}
* are displayed.
*
* <p>Performs Galen and Applitools checks, if enabled.
* <p>Performs Galen checks, if enabled.
*
* @param timeout the timeout for identifying the first element. Note, that there is no timeout
* for any subsequent checks!
Expand All @@ -235,8 +209,6 @@ public T verify() {
@SuppressWarnings("unchecked")
public T verify(int timeout) {
boolean initialCheck = true;
// Applitools
checkWindow();
// Galen
checkLayout();
Class<?> clazz = this.getClass();
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,10 @@
* org.springframework.context.annotation.Primary}).
*/
@Component
public class Stubs implements Applitools, Galen, TemplateMatcher, OCR {
public class Stubs implements Galen, TemplateMatcher, OCR {

private Logger LOG = LoggerFactory.getLogger(Stubs.class);

public void checkWindow() {
throw new UnsupportedOperationException(
"Applitools requires justtestlah-applitools.jar on the classpath.");
}

@Override
public void checkLayout(String specPath, LocatorMap locators) {
throw new UnsupportedOperationException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* Basic utility methods for image processing
*
* <p>This class is extended in justtestlah-visual {@linkplain} qa.justtestlah.visual.ImageUtils}.
* <p>This class is extended in justtestlah-visual qa.justtestlah.visual.ImageUtils.
*/
@Component
public class ImageUtils {
Expand Down
7 changes: 1 addition & 6 deletions justtestlah-demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand All @@ -33,11 +33,6 @@
<artifactId>justtestlah-visual</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-applitools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-galen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion justtestlah-galen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion justtestlah-mobile-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>qa.justtestlah</groupId>
<artifactId>justtestlah-parent</artifactId>
<version>1.9-RC2</version>
<version>1.9-RC3</version>
</parent>
<licenses>
<license>
Expand Down
Loading

0 comments on commit 7ab8e2f

Please sign in to comment.