Id selector not working when combined with a tag selector (#314)

src/Utils.js

@@ -162,7 +162,7 @@ export function withSetStateAllowed(fn) {
 }
 
 export function splitSelector(selector) {
-  return selector.split(/(?=\.|\[.*\])/);
+  return selector.split(/(?=\.|\[.*\])|(?=#|\[#.*\])/);
 }
 
 export function isSimpleSelector(selector) {
@@ -176,7 +176,7 @@ export function selectorError(selector) {
   );
 }
 
-export const isCompoundSelector = /([a-z]\.[a-z]|[a-z]\[.*\])/i;
+export const isCompoundSelector = /([a-z]\.[a-z]|[a-z]\[.*\]|[a-z]#[a-z])/i;
 
 const isPropSelector = /^\[.*\]$/;
 

test/ReactWrapper-spec.js

@@ -224,6 +224,33 @@ describeWithDOM('mount', () => {
       expect(wrapper.find('input').props().className).to.equal('foo');
     });
 
+    it('should find an element based on a tag name and class name', () => {
+      const wrapper = mount(
+        <div>
+          <input className="foo" />
+        </div>
+      );
+      expect(wrapper.find('input.foo').length).to.equal(1);
+    });
+
+    it('should find an element based on a tag name and id', () => {
+      const wrapper = mount(
+        <div>
+          <input id="foo" />
+        </div>
+      );
+      expect(wrapper.find('input#foo').length).to.equal(1);
+    });
+
+    it('should find an element based on a tag name, id, and class name', () => {
+      const wrapper = mount(
+        <div>
+          <input id="foo" className="bar" />
+        </div>
+      );
+      expect(wrapper.find('input#foo.bar').length).to.equal(1);
+    });
+
     it('should find a component based on a constructor', () => {
       class Foo extends React.Component {
         render() { return <div />; }

test/ShallowWrapper-spec.js

@@ -336,6 +336,33 @@ describe('shallow', () => {
       expect(wrapper.find('.foo').type()).to.equal('input');
     });
 
+    it('should find an element based on a tag name and class name', () => {
+      const wrapper = shallow(
+        <div>
+          <input className="foo" />
+        </div>
+      );
+      expect(wrapper.find('input.foo').length).to.equal(1);
+    });
+
+    it('should find an element based on a tag name and id', () => {
+      const wrapper = shallow(
+        <div>
+          <input id="foo" />
+        </div>
+      );
+      expect(wrapper.find('input#foo').length).to.equal(1);
+    });
+
+    it('should find an element based on a tag name, id, and class name', () => {
+      const wrapper = shallow(
+        <div>
+          <input id="foo" className="bar" />
+        </div>
+      );
+      expect(wrapper.find('input#foo.bar').length).to.equal(1);
+    });
+
     it('should find an element based on a tag name', () => {
       const wrapper = shallow(
         <div>