Bladeren bron

Use deployment url property value for base URL if it's defined (#14758).

Change-Id: I249e37cfaf23564b00136b33132df3d339a46e98
tags/7.4.0.beta1
Denis Anisimov 9 jaren geleden
bovenliggende
commit
33ff6768d9

+ 3
- 3
uitest/eclipse-run-selected-test.properties Bestand weergeven

@@ -14,6 +14,9 @@
com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>


; Deployment url to use for testing. Context path must be /
; com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/

;
; For only TestBench 3
;
@@ -29,9 +32,6 @@ com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshot
; Location where TestBench 2 jar can be found
com.vaadin.testbench.lib.dir=<enter location of testbench here>

; Deployment url to use for testing. Context path must be /
com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/

; Run the whole test even if a screenshot comparison fails
com.vaadin.testbench.screenshot.softfail=true


+ 11
- 1
uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java Bestand weergeven

@@ -49,6 +49,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
private static final String RUN_LOCALLY_PROPERTY = "com.vaadin.testbench.runLocally";
private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
private static final String PORT_PROPERTY = "com.vaadin.testbench.deployment.port";
private static final String DEPLOYMENT_PROPERTY = "com.vaadin.testbench.deployment.url";
private static final Properties properties = new Properties();
private static final File propertiesFile = new File("work",
"eclipse-run-selected-test.properties");
@@ -96,6 +97,15 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
return "tb3-hub.intra.itmill.com";
}

@Override
protected String getBaseURL() {
String url = getProperty(DEPLOYMENT_PROPERTY);
if (url == null || url.trim().isEmpty()) {
return super.getBaseURL();
}
return url;
}

@Override
protected String getDeploymentHostname() {
if (getRunLocallyBrowser() != null) {
@@ -180,7 +190,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {

/*
* (non-Javadoc)
*
*
* @see com.vaadin.tests.tb3.AbstractTB3Test#setupLocalDriver()
*/
@Override

Laden…
Annuleren
Opslaan