fix rebase conflicts

enzymejs · Dec 23, 2015 · 3605e49 · 3605e49
2 parents 1ddbf1c + 401309e
commit 3605e49
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/src/__tests__/ReactWrapper-spec.js b/src/__tests__/ReactWrapper-spec.js
@@ -1172,6 +1172,7 @@ describeWithDOM('mount', () => {
           );
         }
       }
+
       const wrapper = mount(<Foo />);
       expect(wrapper.ref('secondRef').prop('amount')).to.equal(4);
       expect(wrapper.ref('secondRef').text()).to.equal('Second');
@@ -1213,19 +1214,6 @@ describeWithDOM('mount', () => {
         `<div class="in-foo"></div>`
       );
     });
-
-    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>`
-      );
-    });
-
   });
 
->>>>>>> Add method, tests, and docs for html method in ReactWrapper
 });