Fix React::Test::Session

zetachang · zetachang · commit 75e51fdbdb39 · 2016-12-10T20:34:45.000+08:00
diff --git a/lib/react/test/session.rb b/lib/react/test/session.rb
@@ -1,9 +1,7 @@
 module React
   module Test
     class Session
-      DSL_METHODS = %i[mount instance native update_params html].freeze
-
-      attr_reader :native
+      DSL_METHODS = %i[mount instance update_params html].freeze
 
       def mount(component_klass, params = {})
         @element = React.create_element(component_klass, params)
@@ -12,21 +10,20 @@ def mount(component_klass, params = {})
 
       def instance
         unless @instance
-          @native = `React.addons.TestUtils.renderIntoDocument(#{@element.to_n})`
-          @instance = `#@native._getOpalInstance()`
+          @container = `document.createElement('div')`
+          @instance = React.render(@element, @container)
         end
         @instance
       end
 
-      def update_params(params)
+      def update_params(params, &block)
         cloned_element = React::Element.new(`React.cloneElement(#{@element.to_n}, #{params.to_n})`)
-        prev_container = `#{@instance.dom_node}.parentNode`
-        React.render(cloned_element, prev_container)
+        React.render(cloned_element, @container, &block)
         nil
       end
 
       def html
-        html = `#{@instance.dom_node}.parentNode.innerHTML`
+        html = `#@container.innerHTML`
         %x{
             var REGEX_REMOVE_ROOT_IDS = /\s?data-reactroot="[^"]*"/g;
             var REGEX_REMOVE_IDS = /\s?data-reactid="[^"]+"/g;
diff --git a/spec/react/test/session_spec.rb b/spec/react/test/session_spec.rb
@@ -41,24 +41,19 @@ def render
       end
     end
 
-    describe '#native' do
-      it 'returns the React native instance of the component' do
-        instance = subject.mount(Greeter)
-        native = instance.instance_variable_get('@native')
-        expect(`#{subject.native} === #{native}`).to eq(true)
-      end
-    end
-
     describe '#html' do
       it 'returns the component rendered to static html' do
         subject.mount(Greeter, message: 'world')
         expect(subject.html).to eq('<span>Hello world</span>')
       end
 
-      it 'returns the updated static html' do
+      async 'returns the updated static html' do
         subject.mount(Greeter)
-        subject.update_params(message: 'moon')
-        expect(subject.html).to eq('<span>Hello moon</span>')
+        subject.update_params(message: 'moon') do
+          run_async {
+            expect(subject.html).to eq('<span>Hello moon</span>')
+          }
+        end
       end
     end
 
