webdriver-angular 0.1.0 → 0.1.1

raw patch · 2 files changed

+20/−23 lines, 2 filesdep ~text

Dependency ranges changed: text

Files

• js/angular-clientsidescripts.js +18/−21
• webdriver-angular.cabal +2/−2

@@ -64,13 +64,12 @@   var bindings = using.getElementsByClassName('ng-binding');   var matches = [];   for (var i = 0; i < bindings.length; ++i) {-    var elemData  = angular.element(bindings[i]).data();-    if (!elemData || !elemData.$binding) {-      continue;-    }-    var bindingName = elemData.$binding[0].exp || elemData.$binding;-    if (bindingName.indexOf(binding) != -1) {-      matches.push(bindings[i]);+    var dataBinding = angular.element(bindings[i]).data('$binding');+    if(dataBinding) {+      var bindingName = dataBinding.exp || dataBinding[0].exp || dataBinding;+      if (bindingName.indexOf(binding) != -1) {+        matches.push(bindings[i]);+      }     }   }   return matches; // Return the whole array for webdriver.findElements.@@ -173,13 +172,12 @@     bindings.push(childBindings[i]);   }   for (var i = 0; i < bindings.length; ++i) {-    var elemData  = angular.element(bindings[i]).data();-    if (!elemData || !elemData.$binding) {-      continue;-    }-    var bindingName = elemData.$binding[0].exp || elemData.$binding;-    if (bindingName.indexOf(binding) != -1) {-      matches.push(bindings[i]);+    var dataBinding = angular.element(bindings[i]).data('$binding');+    if(dataBinding) {+      var bindingName = dataBinding.exp || dataBinding[0].exp || dataBinding;+      if (bindingName.indexOf(binding) != -1) {+        matches.push(bindings[i]);+      }     }   }   return matches;@@ -222,13 +220,12 @@       bindings.push(childBindings[k]);     }     for (var j = 0; j < bindings.length; ++j) {-      var elemData  = angular.element(bindings[j]).data();-      if (!elemData || !elemData.$binding) {-        continue;-      }-      var bindingName = elemData.$binding[0].exp || elemData.$binding;-      if (bindingName.indexOf(binding) != -1) {-        matches.push(bindings[j]);+      var dataBinding = angular.element(bindings[j]).data('$binding');+      if(dataBinding) {+        var bindingName = dataBinding.exp || dataBinding[0].exp || dataBinding;+        if (bindingName.indexOf(binding) != -1) {+          matches.push(bindings[j]);+        }       }     }   }

@@ -1,5 +1,5 @@ name:              webdriver-angular-version:           0.1.0+version:           0.1.1 cabal-version:     >= 1.8 build-type:        Simple synopsis:          Webdriver actions to assist with testing a webpage which uses Angular.Js@@ -44,7 +44,7 @@                  , aeson                >= 0.6                  , language-javascript  >= 0.5  && < 0.6                  , template-haskell     >= 0.6-                 , text                 >= 0.11 && < 0.12+                 , text                 >= 0.11                  , transformers         >= 0.3                  , unordered-containers >= 0.2  && < 0.3