initial support for js timeout (#1)

llonchj · Aug 2, 2017 · b7956b1 · b7956b1
1 parent 711a655
commit b7956b1
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 11 deletions.
diff --git a/assertion.go b/assertion.go
@@ -1,7 +1,9 @@
 package browsersteps
 
 import (
+	"context"
 	"fmt"
+	"time"
 
 	"github.com/DATA-DOG/godog"
 )
@@ -38,18 +40,27 @@ func (b *BrowserSteps) iShouldSeePageTitleAs(expectedTitle string) error {
 }
 
 func (b *BrowserSteps) iShouldSeeIn(expectedText, selector, by string) error {
-	element, err := b.GetWebDriver().FindElement(by, selector)
-	if err != nil {
-		return err
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	for {
+		select {
+		case <-time.After(50 * time.Millisecond):
+			element, err := b.GetWebDriver().FindElement(by, selector)
+			if err != nil {
+				break
+			}
+			gotText, err := element.Text()
+			if err != nil {
+				break
+			}
+			if expectedText != gotText {
+				break
+			}
+			return nil
+		case <-ctx.Done():
+			return ctx.Err()
+		}
 	}
-	gotText, err := element.Text()
-	if err != nil {
-		return err
-	}
-	if expectedText != gotText {
-		return fmt.Errorf("Title Mismatch. Got '%s', Expected '%s'", gotText, expectedText)
-	}
-	return nil
 }
 
 func (b *BrowserSteps) iShouldSee(selector, by string) error {

diff --git a/features/assertion/shouldsee.feature b/features/assertion/shouldsee.feature
@@ -0,0 +1,9 @@
+Feature: Should See Assertion
+
+This feature supports visible/invisible assertion steps
+
+    Scenario: Should See Element
+        Given I am a anonymous user
+        When I navigate to "/js.html"
+        And I submit "submit" id
+        Then I should see "Done!" in "p" id
diff --git a/public/js.html b/public/js.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Test server</title>
+    <style>
+        h1 {
+            text-align: center;
+        }
+
+        body {
+            font-family: Tahoma, Geneva, Verdana, sans-serif;
+        }
+    </style>
+</head>
+
+<body>
+    <form id="myform" onsubmit="javascript: return formSubmit();">
+        <label for="timeout">Timeout(ms)</label>
+        <input id="timeout" name="timeout" value="300">
+        <input type="submit" name="submit" id="submit" value="Submit">
+    </form>
+    <p id="p">Hello!</p>
+    <script>
+        function doIt(t) {
+            var ele = document.getElementById("p");
+            ele.innerHTML = t === undefined ? "Done!" : t;
+        }
+
+        function formSubmit() {
+            doIt("Hello!");
+            var ele = document.getElementById("timeout");
+            var timeout = parseInt(ele.value);
+            setTimeout(doIt, timeout);
+            return false;
+        }
+    </script>
+</body>
+
+</html>