Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Conflicts:
	pom.xml
  • Loading branch information
Marcus Kaufmann committed May 28, 2018
2 parents 7aa70e0 + 6d7aecd commit 25893f1
Show file tree
Hide file tree
Showing 205 changed files with 4,615 additions and 2,252 deletions.
9 changes: 9 additions & 0 deletions config/browser.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ neodymium.webDriver.reuseDriver = false
# Warning: The webdriver process might stay alive even if you close the browser afterwards
neodymium.webDriver.keepBrowserOpen = false

## Whether to keep the browser instance open only if the test fails
# Warning: The webdriver process might stay alive even if you close the browser afterwards
neodymium.webDriver.keepBrowserOpenOnFailure = false

## HTTP proxy settings. Specify host and port of the proxy server and
## whether it should be used at all. If the proxy requires user authentication,
## make sure to provide the credentials needed.
Expand Down Expand Up @@ -118,6 +122,11 @@ neodymium.webDriver.keepBrowserOpen = false
# eager : returns when DOMContentLoaded event was fired
# none : returns immediately
#
# .headless: A boolean propertey that defines if the browser should run in headless mode. Default value is false
# NOTE: Currently only implemented for Firefox and Chrome
# true: start browser in headless mode
# false: (default) start browser normal
#
################################################################################
# A local Chrome with a small window size
browserprofile.Chrome_1024x768.name = Chrome 1024x768
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@
<forkCount>4</forkCount>
<reuseForks>false</reuseForks>
<includes>
<include>**/TestJunitCategoriesSuite.java</include>
<include>com/xceptance/neodymium/tests/**</include>
<include>com/xceptance/neodymium/tests/**/*Test.java</include>
</includes>
</configuration>
</plugin>
Expand Down
54 changes: 0 additions & 54 deletions src/main/java/com/xceptance/neodymium/MethodExecutionContext.java

This file was deleted.

287 changes: 0 additions & 287 deletions src/main/java/com/xceptance/neodymium/NeodymiumBrowserRunner.java

This file was deleted.

Loading

0 comments on commit 25893f1

Please sign in to comment.