Add method, tests, and docs for html method in ReactWrapper

enzymejs · Dec 24, 2015 · a934af9 · a934af9
1 parent 726b2ec
commit a934af9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/ReactWrapper.js b/src/ReactWrapper.js
@@ -293,7 +293,11 @@ 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
   }
 
   /**