@@ -8,14 +8,24 @@ return this; } + function get(url){ + try{ + super.get(arguments.url); + } + catch(java.lang.RuntimeException e){ + throwException("org.mxunit.cfwebdriver.FirefoxLoadFailureException", + "Failed to load Firefox", + "If Firefox is not located in C:/Program Files/Mozilla Firefox/, please set the path to the Firefox executable using driver.setFirefoxPath(...)"); + } + } - function setFireFoxPath(path){ - createObject("java","java.lang.System").setProperty("webdriver.firefox.bin", path); - } - - function setUseExistingFireFoxInstance(toggle){ - createObject("java","java.lang.System").setProperty("webdriver.firefox.useExisting", toggle); - } + function setFireFoxPath(path){ + createObject("java","java.lang.System").setProperty("webdriver.firefox.bin", path); + } + + function setUseExistingFireFoxInstance(toggle){ + createObject("java","java.lang.System").setProperty("webdriver.firefox.useExisting", toggle); + } </cfscript> </cfcomponent> \ No newline at end of file FirefoxDriver.cfc @@ -14,6 +14,8 @@ } + + function isJavascriptEnabled(){ return this.driver.isJavascriptEnabled(); } // boolean HtmlUnitDriver.cfc @@ -1,9 +1,9 @@ -<cfcomponent output="false"> +<cfcomponent output="false" extends="WebDriver"> <cfscript> function init(){ this.driverType = "Internet Explorer"; - this.driver = createObject("java","org.openqa.selenium.ie.InternetExplorerDriver"); + this.driver = createObject("java","org.openqa.selenium.ie.InternetExplorerDriver"); return this; } </cfscript> InternetExplorerDriver.cfc @@ -107,11 +107,11 @@ try{ return findElementByLinkText(by); - }catch(org.openqa.selenium.NoSuchElementException ex){} + }catch(org.openqa.selenium.NoSuchElementException ex){} - return ""; //return empty string, mo exception - } - + return ""; //return empty string, if it's not there - no exceptions for now + } + function findElementByLinkText(text){ var element = createObject("component","WebElement"); @@ -137,12 +137,26 @@ } //java.lang.String + function findElementByName(name) { + var element = this.driver.findElement(this.by.name(name)); + return createObject("component","WebElement").init(element); + } + function findElementById(id) { - return this.driver.findElementById(id); + var element = this.driver.findElement(this.by.id(id)); + return createObject("component","WebElement").init(element); } //) function findElementsById(id) { - return this.driver.findElementsById(id); + var elements = arrayNew(1); + var element = ""; + var i = 1; + var webelements = this.driver.findElementsById(id); + for(i = 1; i lte arrayLen(webelements); i = i +1){ + element = createObject("component","WebElement").init(webelements[i]); + elements.add(element); + } + return elements; //array of WebElement objects } //)(java.lang.String) java.util.List @@ -165,9 +179,7 @@ } - function findElementByName(name) { - return this.driver.findElementByName(name); - } + function findElementsByXPath(xpath) { @@ -185,7 +197,8 @@ function findElementByXPath(xpath) { - return this.driver.findElementByXPath(xpath); + var element = this.driver.findElementByXPath(xpath); + return createObject("component","WebElement").init(element); } @@ -228,12 +241,10 @@ - + //To Do's ...................... - function findElements(by){ - throwNotImplementedException("findElements(by)"); - } // org.openqa.selenium.By :: org.openqa.selenium.WebElement + function manage(){ throwNotImplementedException("manage"); @@ -250,6 +261,13 @@ detail="Method name: #arguments.methodName#"> </cffunction> - + <cffunction name="throwException"> + <cfargument name="type" /> + <cfargument name="message" /> + <cfargument name="detail" /> + <cfthrow type="#arguments.type#" + message="#arguments.message#" + detail="#arguments.detail#"> + </cffunction> </cfcomponent> \ No newline at end of file WebDriver.cfc @@ -2,6 +2,7 @@ <cfscript> function doGoogleSearch(){ driver = createObject("component","cfwebdriver.WebDriver").newInstance("firefox"); + driver.setFirefoxPath("C:/Programs/Mozilla Firefox/firefox.exe"); driver.get("http://google.com"); q = driver.findElement("q"); q.sendKeys("mxunit"); test/example1.cfc @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <config> - <file name="mxunitblog" path="file:///home/billy/webapps/cfwebdriver/test/fixture/MXUnitBlog.html" /> + <file name="mxunitblog" path="file:///C:/JRun4/servers/dev/cfusion.ear/cfusion.war/cfwebdriver/test/fixture/MXUnitBlog.html" /> </config> test/internal/test-config.xml 51c8406c8b6cc683b94d16cdb5b7acdb445f2601 bill[y] billshelton@comcast.net http://github.com/virtix/cfwebdriver/commit/33c9601c080a195092caba8b01d9179a9a68c92c 33c9601c080a195092caba8b01d9179a9a68c92c 2008-10-08T13:08:54-07:00 2008-10-08T13:08:54-07:00 updating findElement methods f0019b3147652046738353077f6fe6dd532c6fd8 bill[y] billshelton@comcast.net