fix(clientsidescripts): make exactBinding more exact

See #925
angular · Jun 17, 2014 · f9082d0 · f9082d0 · owenmead · Jun 19, 2014
1 parent 4e1cfe5
commit f9082d0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/clientsidescripts.js b/lib/clientsidescripts.js
@@ -53,7 +53,7 @@ functions.findBindings = function(binding, exactMatch, using) {
     if(dataBinding) {
       var bindingName = dataBinding.exp || dataBinding[0].exp || dataBinding;
       if (exactMatch) {
-        var matcher = new RegExp('([^a-zA-Z\\d]|$)' + binding + '([^a-zA-Z\\d]|^)');
+        var matcher = new RegExp('({|\\s|$|\\|)' + binding + '(}|\\s|^|\\|)');
         if (matcher.test(bindingName)) {
           matches.push(bindings[i]);
         }

diff --git a/lib/locators.js b/lib/locators.js
@@ -103,8 +103,19 @@ ProtractorBy.prototype.binding = function(bindingDescriptor) {
  * Find an element by exact binding.
  *
  * @alias by.exactBinding()
- * Same as by.binding() except this does not allow for partial matches
+ * @view
+ * <span>{{ person.name }}</span>
+ * <span ng-bind="person-email"></span>
+ * <span>{{person_phone|uppercase}}</span>
  *
+ * @example
+ * expect(element(by.exactBinding('person.name')).isPresent()).toBe(true);
+ * expect(element(by.exactBinding('person-email')).isPresent()).toBe(true);
+ * expect(element(by.exactBinding('person')).isPresent()).toBe(false);
+ * expect(element(by.exactBinding('person_phone')).isPresent()).toBe(true);
+ * expect(element(by.exactBinding('person_phone|uppercase')).isPresent()).toBe(true);
+ * expect(element(by.exactBinding('phone')).isPresent()).toBe(false);
+ * 
  * @param {string} bindingDescriptor
  * @return {{findElementsOverride: findElementsOverride, message: string}}
  */