Makes regex more robust in html() based on review feedback

Author: Nate Piche

src/ReactWrapper.js

@@ -293,11 +293,7 @@ export default class ReactWrapper {
    * @returns {String}
    */
   html() {
-<<<<<<< HEAD
     return this.single(n => findDOMNode(n).outerHTML.replace(/\sdata-reactid+="[^"]+"/g, ''));
-=======
-    return this.single(n => findDOMNode(n).outerHTML.replace(/\sdata-reactid[^>]+/g, ''));
->>>>>>> Add method, tests, and docs for html method in ReactWrapper
   }
 
   /**

src/__tests__/ReactWrapper-spec.js

@@ -1213,6 +1213,21 @@ describeWithDOM('mount', () => {
         `<div class="in-foo"></div>`
       );
     });
+<<<<<<< HEAD
+=======
+
+    it('should remove all data-react attributes from anywhere in the HTML', () => {
+      const wrapper = mount(
+        <div data-react-props="begone" data-react-class="begone" className="test">
+          <span>Hello World!</span>
+        </div>
+      );
+      expect(wrapper.html()).to.equal(
+        `<div class="test"><span>Hello World!</span></div>`
+      );
+    });
+
+>>>>>>> Makes regex more robust in html() based on review feedback
   });
 
 });