aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/eclipse-run-selected-test.properties
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-09-26 09:28:50 +0300
committerArtur Signell <artur@vaadin.com>2013-09-26 09:28:50 +0300
commitc18b20050d6b04a2c69b3fdfc75ca901b78edc0a (patch)
tree1d91200782aa20a4fcf331bb0f773070c7cd080a /uitest/eclipse-run-selected-test.properties
parent7c5bdce3b4c76e7f19bc46bcaed135d67a94f06a (diff)
parentbd0ae0581f265be57374b236cfe1b71043ab69aa (diff)
downloadvaadin-framework-c18b20050d6b04a2c69b3fdfc75ca901b78edc0a.tar.gz
vaadin-framework-c18b20050d6b04a2c69b3fdfc75ca901b78edc0a.zip
Merge changes from origin/7.1
7f7dc31 Base files for TB3 tests (#12572) 6b17abe Make it possible to override web driver in tests (#12572) a682e3b Refactored build scripts to support TB2, TB3 + integration tests (#12572) e556642 Converted servlet integration tests to TB3 (#12573) 21af0c3 Updated TB3 tests to use Firefox 24 (#12604) a7583c6 TB3 test for browsers (#12572) 37b8543 Do not add empty package javadoc for new classes 0248b8f Fixes browser detection for IE11 (#12638) 1df28c3 Run TB3 tests also on IE11 (#12631) a2daf65 Converted TB2 push tests to TB3 (#12580) d3261d7 Fixes issue with Table not scrolling completely to the end #12651 bd0ae05 Limit the number of tests run concurrently (#12572) Change-Id: Idb4389aac388b728490a4ffd57d30aee20ea9fe8
Diffstat (limited to 'uitest/eclipse-run-selected-test.properties')
-rw-r--r--uitest/eclipse-run-selected-test.properties26
1 files changed, 18 insertions, 8 deletions
diff --git a/uitest/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index f6cb2551e9..cbd1ab1cef 100644
--- a/uitest/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
@@ -1,14 +1,23 @@
-; Location where vaadin-testbench 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/
+;
+; For both TestBench 2 and 3
+;
; Location of the screenshot directory.
; This is the directory that contains the "references" directory
com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>
-; Run the whole test even if
+
+;
+; For only TestBench 2
+;
+
+; 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
; Screen capture at the end if the test fails
@@ -23,7 +32,8 @@ com.vaadin.testbench.screenshot.cursor=true
; Uncomment to limit to certain browsers or override in launch configuration
; browsers=winxp-opera10
-; Claim that the server has started succesfully. Needed for the tests to run
+; Claim that the server has started succesfully. Needed for TB2 tests to be executed
server.start.succeeded=1
-test-output-dir=../build/test-output \ No newline at end of file
+; Directory where temporary Java classes are created
+test-output-dir=../build/test-output