Changeset 1339

Timestamp:

06/29/09 20:54:36 (9 months ago)

Author:

admc

Message:

fixing ticket 278, assert tightness

Location:

trunk

Files:

• test/local_tests/test_dragdropunit.py (modified) (1 diff)
• test/local_tests/test_unit.py (modified) (1 diff)
• windmill/html/js/controller/asserts.js (modified) (2 diffs)

trunk/test/local_tests/test_dragdropunit.py

@@ -32 +32 @@
     client.dragDropElemToElem(xpath="//div/div[3]/div[2]", optxpath="//div/div[3]/div[4]")
     client.waits.sleep(milliseconds=u'500')
-    client.asserts.assertText(xpath="//div/div[3]/div[4]", validator='Dropped!')
+    client.asserts.assertElemJS(xpath="//div/div[3]/div[4]", js=u"element.innerHTML.indexOf('Dropped!') != -1")
     client.dragDropElem(xpath="//div/div[3]/div[2]", pixels='(0,200)')
     client.waits.sleep(milliseconds=u'500')
-    client.asserts.assertText(xpath=u"//div/div[3]/div[4]", validator=u'Dropped! Dropped!')
+    client.asserts.assertElemJS(xpath="//div/div[3]/div[4]", js=u"element.innerHTML.indexOf('Dropped! Dropped!') != -1")
     #test the sortable widgets
     client.click(link=u'Sortable')

trunk/test/local_tests/test_unit.py

@@ -68 +68 @@
     assert client.asserts.assertChecked(id=u'Dizziness')['result']
     assert client.type(text=u'The text area tester', name=u'story')['result']
-    assert client.asserts.assertValue(validator=u'area', id=u'story')['result']
+    assert client.asserts.assertValue(validator=u'The text area tester', id=u'story')['result']
     assert client.select(option=u'Strawberry', id=u'flavor')['result']
     assert client.asserts.assertSelected(validator=u'b', id=u'flavor')['result']

trunk/windmill/html/js/controller/asserts.js

@@ -117 +117 @@
   var n = lookupNode(paramObject);
   var validator = paramObject.validator;
-  if (n.innerHTML.indexOf(validator) != -1){
+  if (n.innerHTML == validator){
     return true;
   }
-  if (n.hasChildNodes()){
-    for(var m = n.firstChild; m != null; m = m.nextSibling) {
-      //for non text nodes
-      if (m.nodeType != 3){
-        if (m.innerHTML.indexOf(validator) != -1){
-          return true;
-        }
-        if (m.value && m.value.indexOf(validator) != -1){
-          return true;
-        }
-      }
-    }
-  }
+  
   var found = n.textContent;
   if (found == undefined)
@@ -154 +142 @@
     throw "Element doesn't have a value";
 
-  if (n.value.indexOf(validator) == -1){
+  if (n.value != validator){
     throw "Found value \""+ n.value + "\" is not equal to \""+ validator+"\"";
   }
-  
 };