test-suite/tests/000_test_helpers.js
changeset 636 a8ab808d33c3
parent 633 44634d19db32
--- a/test-suite/tests/000_test_helpers.js	Mon Apr 14 11:05:01 2014 +0200
+++ b/test-suite/tests/000_test_helpers.js	Mon Apr 14 20:51:24 2014 +0200
@@ -29,7 +29,17 @@
 	}));
 }
 
-/** Test if the selected DOM element is defined or has a given value : .val()
+/** Test if the selected DOM element .text() value match the given regexp
+ *	s : CSS selector
+ *	r : regexp to match
+ */
+function test_match (s, r) {
+	test (s+' text match '+r, dsl(function () {
+		expect (elt (s).text ()).toMatch (r);
+	}));
+}
+
+/** Test if the selected DOM element has a given value : .val()
  *	s : CSS selector
  *	e : expected value, if omited, test existence
  */
@@ -40,6 +50,9 @@
 	}));
 }
 
+/**
+ *
+ */
 function test_exist (s) {
 	test_val (s);
 }
@@ -56,16 +69,6 @@
 	}));
 }
 
-/** Test if the selected DOM element .text() value match the given regexp
- *	s : CSS selector
- *	r : regexp to match
- */
-function test_match (s, r) {
-	test (s+' text match '+r, dsl(function () {
-		expect (elt (s).text ()).toMatch (r);
-	}));
-}
-
 /** Count selector occurences
  *	s : CSS selector
  *	e : expected count
@@ -109,27 +112,32 @@
 }
 
 /**
- * Click somewhere
+ * Click on something
  * s : selector of the item to click on
+ * w : should we wait for a page to load in the browser after the click
  * v : is the element visible or not
  */
-function test_click (s, v) {
-    test ('click '+s, dsl(function () {
-        elt (s, v).click ();
-    }));
+function test_click (s, w, v) {
+	var t = 'click '+ w ? 'to submit form ' : '';
+	test (t+s, dsl(function () {
+		elt (s, v).click ();
+		if (w)
+			browser.waitForPageLoad ();
+	}));
 }
 
 /**
- * Submit a form
- * s : selector of the submit button
+ * Send submit event to the given form
+ * s : selector of the form to submit
  */
 function test_submit (s) {
-	test ('submit '+s, dsl(function () {
-		elt (s).click ();
+	test ('send submit event to '+s, dsl(function () {
+		elt (s).submit ();
 		browser.waitForPageLoad ();
 	}));
 }
 
+
 /**
  * Reload a page
  */