[React::Test::Session] Minimize API surface & refactor

zetachang · zetachang · commit bce54480a448 · 2016-11-15T18:02:53.000+08:00
diff --git a/lib/react/test/session.rb b/lib/react/test/session.rb
@@ -1,8 +1,9 @@
 module React
   module Test
     class Session
-      DSL_METHODS = %i[mount instance native element update_params
-        force_update! html].freeze
+      DSL_METHODS = %i[mount instance native update_params html].freeze
+
+      attr_reader :native
 
       def mount(component_klass, params = {})
         @element = React.create_element(component_klass, params)
@@ -11,35 +12,28 @@ def mount(component_klass, params = {})
 
       def instance
         unless @instance
-          @native = Native(`React.addons.TestUtils.renderIntoDocument(#{element.to_n})`)
-          @instance = `#{@native.to_n}._getOpalInstance()`
+          @native = `React.addons.TestUtils.renderIntoDocument(#{@element.to_n})`
+          @instance = `#@native._getOpalInstance()`
         end
         @instance
       end
 
-      def native
-        @native
-      end
-
-      def element
-        @element
-      end
-
       def update_params(params)
-        cloned_element = React::Element.new(`React.cloneElement(#{self.element.to_n}, #{params.to_n})`)
-        prev_container = `#{self.instance.dom_node}.parentNode`
+        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)
         nil
       end
 
-      def force_update!
-        native.force_update!
-      end
-
       def html
-        # How can we get the current ReactElement w/o violating private APIs?
-        elem = Native(native[:_reactInternalInstance][:_currentElement])
-        React.render_to_static_markup(elem)
+        html = `#{@instance.dom_node}.parentNode.innerHTML`
+        %x{
+            var REGEX_REMOVE_ROOT_IDS = /\s?data-reactroot="[^"]*"/g;
+            var REGEX_REMOVE_IDS = /\s?data-reactid="[^"]+"/g;
+            html = html.replace(REGEX_REMOVE_ROOT_IDS, '');
+            html = html.replace(REGEX_REMOVE_IDS, '');
+        }
+        return html
       end
     end
   end
diff --git a/spec/react/test/session_spec.rb b/spec/react/test/session_spec.rb
@@ -41,18 +41,11 @@ def render
       end
     end
 
-    describe '#element' do
-      it 'returns the React::Element for the mounted component' do
-        subject.mount(Greeter)
-        expect(subject.element).to be_a(React::Element)
-      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).to eq(native)
+        expect(`#{subject.native} === #{native}`).to eq(true)
       end
     end
 
@@ -89,11 +82,11 @@ def render
       end
     end
 
-    describe '#force_update' do
+    describe 'instance#force_update!' do
       it 'causes the component to render' do
         instance = subject.mount(Greeter)
         expect(instance).to receive(:render)
-        subject.force_update!
+        subject.instance.force_update!
       end
     end
   end
