added parent for issue #73

lefthandedgoat · Apr 22, 2013 · a811354 · a811354
1 parent d7af3ee
commit a811354
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/basictests/Program.fs b/basictests/Program.fs
@@ -183,6 +183,10 @@ test (fun _ ->
     count ".item" 5
     2 === (element "span" |> elementsWithin ".item" |> List.length))
 
+"parent of firstItem and secondItem is list" &&&& (fun _ ->
+    url "http://localhost:4567/parent"
+    "list" === (element "#firstItem" |> parent).GetAttribute("id"))
+
 context "reddit tests"
 once (fun _ -> Console.WriteLine "once: reddit tests")
 before (fun _ -> Console.WriteLine "before: reddit tests")

diff --git a/canopy/canopy.fs b/canopy/canopy.fs
@@ -208,6 +208,8 @@ let element cssSelector = find cssSelector elementTimeout browser
 
 let elementWithin cssSelector (elem:IWebElement) =  find cssSelector elementTimeout elem
 
+let parent (elem:IWebElement) = elem |> elementWithin ".."
+
 let elements cssSelector = findMany cssSelector elementTimeout browser
 
 let elementsWithin cssSelector (elem:IWebElement) = findMany cssSelector elementTimeout elem

diff --git a/testpages/app.rb b/testpages/app.rb
@@ -75,4 +75,8 @@
 
 get '/elementWithin' do
   erb :elementWithin
+end
+
+get '/parent' do
+  erb :parent
 end
diff --git a/testpages/views/parent.erb b/testpages/views/parent.erb
@@ -0,0 +1,16 @@
+<html>
+    <head>
+        <title>canopy testing page</title>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    </head>
+
+    <body>
+
+	<ul id="list">		
+		<li id="firstItem">item 1</li>
+		<li id="secondItem">item 2</li>
+	</ul>        
+
+    </body>
+</html>
+
diff --git a/testpages/views/waitFor.erb b/testpages/views/waitFor.erb
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <title>floak testing page</title>
+        <title>canopy testing page</title>
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     </head>