diff --git a/.gitignore b/.gitignore index 8f45964..2792f02 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,4 @@ buildNumber.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +/.idea/libraries/ diff --git a/pom.xml b/pom.xml index d086a62..a452557 100644 --- a/pom.xml +++ b/pom.xml @@ -13,12 +13,12 @@ org.seleniumhq.selenium selenium-java - 3.0.1 + 3.4.0 org.testng testng - 6.10 + 6.11 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 2.20 org.eluder.coveralls @@ -41,7 +41,7 @@ org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + 0.7.9 diff --git a/src/test/java/localbrowsers/Firefox.java b/src/test/java/localbrowsers/Firefox.java index 4cb1cc8..3f4f401 100644 --- a/src/test/java/localbrowsers/Firefox.java +++ b/src/test/java/localbrowsers/Firefox.java @@ -23,24 +23,24 @@ public class Firefox { public void firefoxSetup() { DesiredCapabilities capabilities = DesiredCapabilities.firefox(); capabilities.setCapability("marionette", true); - System.out.println(System.getProperty("os.name")); - if(!System.getProperty("os.name").toLowerCase().contains("windows")){ - FirefoxBinary ff = new FirefoxBinary(new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin")); - FirefoxProfile ffp = new FirefoxProfile(); - - driver = new FirefoxDriver(ff, ffp, capabilities);} - else{ + // mac requires the binary location to be set for firefox, not sure why at time of update + if (System.getProperty("os.name").toLowerCase().contains("mac")) { + FirefoxBinary ff = new FirefoxBinary(new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin")); + FirefoxProfile ffp = new FirefoxProfile(); + driver = new FirefoxDriver(ff, ffp, capabilities); + } else { driver = new FirefoxDriver(); } } + @Test - public void test(){ + public void test() { driver.get("http://lazycoder.io/about.html"); Assert.assertEquals(driver.getTitle(), "Lazy Coder Origins"); } @AfterTest - public void testTeardown(){ + public void testTeardown() { driver.quit(); } } diff --git a/windows_install.bat b/windows_install.bat index 2ee7df3..046f7ea 100644 --- a/windows_install.bat +++ b/windows_install.bat @@ -3,7 +3,10 @@ title Setting up your machine for Selenium Testing! @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" -choco install firefox -choco install googlechrome -choco install phantomjs -choco install selenium-all-drivers +choco install firefox -y +choco install googlechrome -y +choco install phantomjs -y +choco install selenium-all-drivers -y +choco install jdk8 -y +choco install maven -y +SETX PATH "%PATH%;C:\tools\selenium" \ No newline at end of file