Permalink
Browse files

Use selenium.yml for tunnel AND Selenium configuration.

Selenium.yml location configurable with -DseleniumConfigFilePath
Stanza within that file to use is configurable with -DseleniumEnvironment
Created new tasks in build_compile.xml: run_integration_tests_selenium_local/sauce.
  • Loading branch information...
1 parent 6d09bfb commit 5b43cfae4f94af5294e1fc2a71aeeb779409c938 Chad Woolley & Sam Pierson committed Jan 13, 2010
View
@@ -83,6 +83,20 @@
description="Custom path to jsunit.jar file (e.g. if you want to use a Jar outside of lib/bin)."
/>
+ <property
+ id="seleniumConfigFilePath"
+ name="seleniumConfigFilePath"
+ value="${user.home}/selenium.yml"
+ description="Location of file containing selenium configuration options."
+ />
+
+ <property
+ id="seleniumEnvironment"
+ name="seleniumEnvironment"
+ value="local"
+ description="Stanza within seleniumConfigFile to use."
+ />
+
<property name="bin" location="java/bin"/>
<property name="lib" location="java/lib"/>
<property name="loggingPropertiesFile" location="logging.properties"/>
@@ -136,40 +150,15 @@
</junit>
</target>
- <target name="selenium_test" description="Runs tests on the local machine against selenium">
- <junit showoutput="true" haltonerror="true" haltonfailure="true">
- <formatter type="plain" usefile="false"/>
- <classpath refid="classpath"/>
- <sysproperty key="java.util.logging.config.file" value="${loggingPropertiesFile}"/>
- <sysproperty key="browserFileNames" value="${browserFileNames}"/>
- <sysproperty key="description" value="${description}"/>
- <sysproperty key="closeBrowsersAfterTestRuns" value="${closeBrowsersAfterTestRuns}"/>
- <sysproperty key="logsDirectory" value="${logsDirectory}"/>
- <sysproperty key="port" value="${port}"/>
- <sysproperty key="selenium.server.host" value="localhost"/>
- <sysproperty key="selenium.server.port" value="4444"/>
- <sysproperty key="selenium.browser.startCommand" value="*chrome /Applications/Firefox.app/Contents/MacOS/firefox-bin"/>
- <sysproperty key="selenium.browser.url" value="http://localhost:8080"/>
- <sysproperty key="resourceBase" value="${resourceBase}"/>
- <sysproperty key="timeoutSeconds" value="${timeoutSeconds}"/>
- <sysproperty key="url" value="${url}"/>
- <test name="net.jsunit.SeleniumTest"/>
- </junit>
- </target>
-
- <target name="selenium_sauce" description="Runs tests on the local machine against selenium">
+ <target name="selenium_test" description="Run tests through Selenium">
<junit showoutput="true" haltonerror="true" haltonfailure="true">
<formatter type="plain" usefile="false"/>
<classpath refid="classpath"/>
+ <sysproperty key="seleniumConfigFilePath" value="${seleniumConfigFilePath}"/>
+ <sysproperty key="seleniumEnvironment" value="${seleniumEnvironment}"/>
<sysproperty key="java.util.logging.config.file" value="${loggingPropertiesFile}"/>
- <sysproperty key="browserFileNames" value="${browserFileNames}"/>
<sysproperty key="description" value="${description}"/>
- <sysproperty key="closeBrowsersAfterTestRuns" value="${closeBrowsersAfterTestRuns}"/>
<sysproperty key="logsDirectory" value="${logsDirectory}"/>
- <sysproperty key="port" value="${port}"/>
- <sysproperty key="resourceBase" value="${resourceBase}"/>
- <sysproperty key="timeoutSeconds" value="${timeoutSeconds}"/>
- <sysproperty key="url" value="${url}"/>
<test name="net.jsunit.SeleniumTest"/>
</junit>
</target>
Oops, something went wrong.

0 comments on commit 5b43cfa

Please sign in to comment.