Migrate all left renderElementToDocument & simulateEvent

Author: zetachang

Diff for: lib/react/test/utils.rb

@@ -16,19 +16,9 @@ def self.render_into_document(element, options = {})
         end
       end
 
-      def self.simulate(event, element)
-        Simulate.new.click(element)
-      end
-
-      class Simulate
-        include Native
-        def initialize
-          super(`ReactTestUtils.Simulate`)
-        end
-
-        def click(component_instance)
-          `#{@native}['click']`.call(component_instance.dom_node, {})
-        end
+      def self.simulate(event, element, params = {})
+        simulator = Native(`ReactTestUtils.Simulate`)
+        simulator[event.to_s].call(`element.$dom_node === undefined` ? element : element.dom_node, params)
       end
     end
   end

Diff for: spec/react/component_spec.rb

@@ -573,8 +573,8 @@ def render
       end
 
       element = React.create_element(Foo)
-      instance = renderElementToDocument(element)
-      simulateEvent(:click, instance)
+      instance = React::Test::Utils.render_into_document(element)
+      React::Test::Utils.simulate(:click, instance)
       expect(instance.state.clicked).to eq(true)
     end
 
@@ -645,10 +645,9 @@ def render
         end
       end
 
-      element = renderToDocument(Foo)
-      simulateEvent(:click, element)
-
-      expect(element.refs.field.value).to eq('some_stuff')
+      instance = React::Test::Utils.render_into_document(React.create_element(Foo))
+      React::Test::Utils.simulate(:click, instance)
+      expect(instance.refs[:field].value).to eq('some_stuff')
     end
 
     it "allows access the actual DOM node" do

Diff for: spec/react/element_spec.rb

@@ -110,20 +110,20 @@ def render
     it 'is subscribable through `on(:event_name)` method' do
       expect { |b|
         element = React.create_element("div").on(:click, &b)
-        instance = renderElementToDocument(element)
-        simulateEvent(:click, instance)
+        dom_node = React::Test::Utils.render_into_document(element)
+        React::Test::Utils.simulate(:click, dom_node)
       }.to yield_with_args(React::Event)
 
       expect { |b|
         element = React.create_element("div").on(:key_down, &b)
-        instance = renderElementToDocument(element)
-        simulateEvent(:keyDown, instance, {key: "Enter"})
+        dom_node = React::Test::Utils.render_into_document(element)
+        React::Test::Utils.simulate(:keyDown, dom_node, {key: "Enter"})
       }.to yield_control
 
       expect { |b|
         element = React.create_element("form").on(:submit, &b)
-        instance = renderElementToDocument(element)
-        simulateEvent(:submit, instance, {})
+        dom_node = React::Test::Utils.render_into_document(element)
+        React::Test::Utils.simulate(:submit, dom_node)
       }.to yield_control
     end
 

Diff for: spec/react/event_spec.rb

@@ -17,8 +17,8 @@
       expect(event).to respond_to(:prevent_default)
       expect(event).to respond_to(:stop_propagation)
     end
-    instance = renderElementToDocument(element)
-    simulateEvent(:click, instance)
+    dom_node = React::Test::Utils.render_into_document(element)
+    React::Test::Utils.simulate(:click, dom_node)
   end
 end
 end

Diff for: spec/react/test/utils_spec.rb

@@ -7,19 +7,14 @@
       Foo.class_eval do
         include React::Component
 
-        def hello
-          @hello
-        end
-
         def render
-          @hello = 'hello'
           div { 'Click Me' }.on(:click) { |e| click(e) }
         end
       end
 
-      instance = renderToDocument(Foo)
-      expect_any_instance_of(Foo).to receive(:click)
-      described_class.simulate(:click, instance)
+      instance = React::Test::Utils.render_into_document(React.create_element(Foo))
+      expect(instance).to receive(:click)
+      described_class.simulate(:click, instance.dom_node)
     end
 
     describe "render_into_document" do

Diff for: spec/support/react/spec_helpers.rb

@@ -3,23 +3,13 @@ module React
   module SpecHelpers
     `var ReactTestUtils = React.addons.TestUtils`
 
-
     def renderToDocument(type, options = {})
       element = React.create_element(type, options)
-      renderElementToDocument(element)
-    end
-
-    def renderElementToDocument(element)
       instance = Native(`ReactTestUtils.renderIntoDocument(#{element.to_n})`)
       instance.class.include(React::Component::API)
       instance
     end
 
-    def simulateEvent(event, element, params = {})
-      simulator = Native(`ReactTestUtils.Simulate`)
-      simulator[event.to_s].call(element.dom_node, params)
-    end
-
     def isElementOfType(element, type)
       `React.addons.TestUtils.isElementOfType(#{element.to_n}, #{type.cached_component_class})`
     end