Fix dev.peoperties location.

Fix broken path for driver binaries.
Naimadnap · Jan 29, 2013 · a540e9f · a540e9f
1 parent b4d9a51
commit a540e9f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
     <build>
         <resources>
             <resource>
-                <directory>src/test/resources</directory>
+                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

diff --git a/src/test/resources/dev.properties → src/main/resources/dev.properties b/src/test/resources/dev.properties → src/main/resources/dev.properties
diff --git a/src/test/java/com/lazerycode/selenium/SeleniumBase.java b/src/test/java/com/lazerycode/selenium/SeleniumBase.java
@@ -105,27 +105,27 @@ private static WebDriver loadWebDriver() {
             case CHROME:
                 if (System.getProperties().getProperty("os.arch").toLowerCase().equals("x86_64") || System.getProperties().getProperty("os.arch").toLowerCase().equals("amd64")) {
                     if (System.getProperties().getProperty("os.name").toLowerCase().contains("windows")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/windows/64bit/26/chromedriver.exe");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/windows/googlechrome/64bit/26/chromedriver.exe");
                     } else if (System.getProperties().getProperty("os.name").toLowerCase().contains("mac")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/osx/64bit/26/chromedriver");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/osx/googlechrome/64bit/26/chromedriver");
                     } else if (System.getProperties().getProperty("os.name").toLowerCase().contains("linux")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/linux/64bit/26/chromedriver");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/linux/googlechrome/64bit/26/chromedriver");
                     }
                 } else {
                     if (System.getProperties().getProperty("os.name").toLowerCase().contains("windows")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/windows/32bit/26/chromedriver.exe");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/windows/googlechrome/32bit/26/chromedriver.exe");
                     } else if (System.getProperties().getProperty("os.name").toLowerCase().contains("mac")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/osx/32bit/26/chromedriver");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/osx/googlechrome/32bit/26/chromedriver");
                     } else if (System.getProperties().getProperty("os.name").toLowerCase().contains("linux")) {
-                        System.setProperty("webdriver.chrome.driver", "selenium_standalone_binaries/googlechrome/linux/32bit/26/chromedriver");
+                        System.setProperty("webdriver.chrome.driver", _prop.getString("binaryRootFolder") + "/linux/googlechrome/32bit/26/chromedriver");
                     }
                 }
                 break;
             case IE:
                 if (System.getProperties().getProperty("os.arch").toLowerCase().equals("x86_64") || System.getProperties().getProperty("os.arch").toLowerCase().equals("amd64")) {
-                    System.setProperty("webdriver.ie.driver", "selenium_standalone_binaries/internetexplorer/windows/64bit/2.29.0/IEDriverServer.exe");
+                    System.setProperty("webdriver.ie.driver", _prop.getString("binaryRootFolder") + "/windows/internetexplorer/64bit/2.29.0/IEDriverServer.exe");
                 } else {
-                    System.setProperty("webdriver.ie.driver", "selenium_standalone_binaries/internetexplorer/windows/32bit/2.29.0/IEDriverServer.exe");
+                    System.setProperty("webdriver.ie.driver", _prop.getString("binaryRootFolder") + "/windows/internetexplorer/32bit/2.29.0/IEDriverServer.exe");
                 }
                 break;
         }