fixes enzymejs#590: change isCompoundSelector to not match prop selector

joeduncan · Sep 12, 2016 · 26c155b · 26c155b · ManuelDeLeon · Sep 12, 2016
1 parent 69b7a18
commit 26c155b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Utils.js b/src/Utils.js
@@ -189,7 +189,7 @@ export function selectorError(selector, type = '') {
   );
 }
 
-export const isCompoundSelector = /([a-z]\.[a-z]|[a-z]\[.*\]|[a-z]#[a-z])/i;
+export const isCompoundSelector = /^(\w+#\w+(\.\w+)*|\.?\w+(\.\w+)+|\w+\[.*\])$/i;
 
 const isPropSelector = /^\[.*\]$/;
 

diff --git a/test/ShallowWrapper-spec.jsx b/test/ShallowWrapper-spec.jsx
@@ -346,6 +346,17 @@ describe('shallow', () => {
       expect(wrapper.find('.foo').type()).to.equal('input');
     });
 
+    it('should find element that has dot in attribute', () => {
+      const wrapper = shallow(
+        <div>
+          <div data-baz="foo.bar" />
+        </div>
+      );
+
+      const elements = wrapper.find('[data-baz="foo.bar"]');
+      expect(elements.length).to.equal(1);
+    });
+
     it('should find an element based on a tag name and class name', () => {
       const wrapper = shallow(
         <div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,7 +189,7 @@ export function selectorError(selector, type = '') { @@
       );
     }
-    export const isCompoundSelector = /([a-z]\.[a-z]|[a-z]\[.*\]|[a-z]#[a-z])/i;
+    export const isCompoundSelector = /^(\w+#\w+(\.\w+)*|\.?\w+(\.\w+)+|\w+\[.*\])$/i;
     const isPropSelector = /^\[.*\]$/;
@@ Expand Down @@