remove more spec duplication

Author: ajjahn

spec/react/component/base_spec.rb

@@ -25,12 +25,9 @@ def render
         @instance_data.join(" ")
       end
     end
-    expect(rendered_component(Foo)).to eq("<span>working</span>")
-    expect(rendered_component(Bar)).to eq("<span>working well</span>")
+    expect(render_to_html(Foo)).to eq("<span>working</span>")
+    expect(render_to_html(Bar)).to eq("<span>working well</span>")
   end
 
-  def rendered_component(component)
-    React.render_to_static_markup(React.create_element(component))
-  end
 end
 end

spec/react/component_spec.rb

@@ -120,7 +120,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>bar</div>')
+      expect(render_to_html(Foo)).to eq('<div>bar</div>')
     end
 
     it 'allows kernal method names like "format" to be used as state variable names' do
@@ -131,7 +131,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>yes</div>')
+      expect(render_to_html(Foo)).to eq('<div>yes</div>')
     end
 
     it 'returns an observer with the bang method and no arguments' do
@@ -141,7 +141,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>React::Observable</div>')
+      expect(render_to_html(Foo)).to eq('<div>React::Observable</div>')
     end
 
     it 'returns the current value of a state when written' do
@@ -152,15 +152,15 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>bar</div>')
+      expect(render_to_html(Foo)).to eq('<div>bar</div>')
     end
 
     it 'can access an explicitly defined state`' do
       Foo.class_eval do
         define_state foo: :bar
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>bar</div>')
+      expect(render_to_html(Foo)).to eq('<div>bar</div>')
     end
 
   end
@@ -304,7 +304,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>bar</div>')
+      expect(render_to_html(Foo)).to eq('<div>bar</div>')
     end
 
     it 'transforms state getter to Ruby object' do
@@ -320,7 +320,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>Hello</div>')
+      expect(render_to_html(Foo)).to eq('<div>Hello</div>')
     end
   end
 
@@ -468,8 +468,8 @@ def render
           end
         end
 
-        expect(React.render_to_static_markup(React.create_element(Foo, foo: 'lorem'))).to eq('<div>lorem-bar</div>')
-        expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>foo-bar</div>')
+        expect(render_to_html(Foo, foo: 'lorem')).to eq('<div>lorem-bar</div>')
+        expect(render_to_html(Foo)).to eq('<div>foo-bar</div>')
       end
     end
   end
@@ -596,7 +596,7 @@ def render
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Bar))).to eq('<div><div><span>astring</span></div></div>')
+      expect(render_to_html(Bar)).to eq('<div><div><span>astring</span></div></div>')
     end
 
     it 'builds single node in top-level render without providing a block' do
@@ -609,8 +609,7 @@ def render
         end
       end
 
-      element = React.create_element(Foo)
-      expect(React.render_to_static_markup(element)).to eq('<div></div>')
+      expect(render_to_html(Foo)).to eq('<div></div>')
     end
 
     it 'redefines `p` to make method missing work' do
@@ -627,9 +626,8 @@ def render
         end
       end
 
-      element = React.create_element(Foo)
       markup = '<p class="foo"><p></p><div>lorem ipsum</div><p id="10"></p></p>'
-      expect(React.render_to_static_markup(element)).to eq(markup)
+      expect(render_to_html(Foo)).to eq(markup)
     end
 
     it 'only overrides `p` in render context' do

spec/react/dsl_spec.rb

@@ -12,7 +12,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>hello</div>')
+    expect(render_to_html(Foo)).to eq('<div>hello</div>')
   end
 
   it "has a .span short hand String method" do
@@ -24,7 +24,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div><span>hello</span><span>goodby</span></div>')
+    expect(render_to_html(Foo)).to eq('<div><span>hello</span><span>goodby</span></div>')
   end
 
   it "has a .br short hand String method" do
@@ -36,7 +36,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div><span>hello<br></span></div>')
+    expect(render_to_html(Foo)).to eq('<div><span>hello<br></span></div>')
   end
 
   it "has a .td short hand String method" do
@@ -48,7 +48,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<table><tr><td>hello</td></tr></table>')
+    expect(render_to_html(Foo)).to eq('<table><tr><td>hello</td></tr></table>')
   end
 
   it "has a .para short hand String method" do
@@ -60,7 +60,25 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div><p>hello</p></div>')
+    expect(render_to_html(Foo)).to eq('<div><p>hello</p></div>')
+  end
+
+  it "will treat the component class name as a first class component name" do
+    stub_const 'Biz::Mod::Bar', Class.new
+    Biz::Mod::Bar.class_eval do
+      include React::Component
+      def render
+        "a man walks into a bar"
+      end
+    end
+    stub_const 'Foo', Class.new(React::Component::Base)
+    Foo.class_eval do
+      def render
+        Biz::Mod::Bar()
+      end
+    end
+
+    expect(render_to_html(Foo)).to eq('<span>a man walks into a bar</span>')
   end
 
   it "will treat the component class name as a first class component name" do
@@ -78,7 +96,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span>a man walks into a bar</span>')
+    expect(render_to_html(Foo)).to eq('<span>a man walks into a bar</span>')
   end
 
   it "can add class names by the haml .class notation" do
@@ -96,7 +114,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span class="the-class">a man walks into a bar</span>')
+    expect(render_to_html(Foo)).to eq('<span class="the-class">a man walks into a bar</span>')
   end
 
   it "can use the 'class' keyword for classes" do
@@ -108,7 +126,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span class="the-class">hello</span>')
+    expect(render_to_html(Foo)).to eq('<span class="the-class">hello</span>')
   end
 
   it "can generate a unrendered node using the .as_node method" do          # div { "hello" }.as_node
@@ -120,7 +138,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span>React::Element</span>')
+    expect(render_to_html(Foo)).to eq('<span>React::Element</span>')
   end
 
   it "can use the dangerously_set_inner_HTML param" do
@@ -132,7 +150,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>Hello&nbsp;&nbsp;Goodby</div>')
+    expect(render_to_html(Foo)).to eq('<div>Hello&nbsp;&nbsp;Goodby</div>')
   end
 
   it "will remove all elements passed as params from the rendering buffer" do
@@ -155,7 +173,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Test))).to eq('<div><b>hello</b><b>hello</b></div>')
+    expect(render_to_html(Test)).to eq('<div><b>hello</b><b>hello</b></div>')
   end
 end
 end

spec/react/react_spec.rb

@@ -102,7 +102,7 @@ def render
           end
         end
 
-        expect(React.render_to_static_markup(React.create_element(Foo))).to eq("<div>20</div>")
+        expect(render_to_html(Foo)).to eq("<div>20</div>")
       end
 
       it "should match the instance cycle to ReactComponent life cycle" do

spec/react/top_level_component_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 if opal?
-
 module Components
-
   module Controller
     class Component1
       include React::Component
@@ -40,10 +38,9 @@ def render
   end
 end
 
-
 def render_top_level(controller, component_name)
-  React.render_to_static_markup(React.create_element(
-    React::TopLevelRailsComponent, {controller: controller, component_name: component_name, render_params: {}}))
+  render_to_html(React::TopLevelRailsComponent, controller: controller,
+                 component_name: component_name, render_params: {})
 end
 
 describe React::TopLevelRailsComponent do
@@ -63,6 +60,5 @@ def render_top_level(controller, component_name)
   it 'can find the correct component when the name is fully qualified' do
     expect(render_top_level("Controller", "::Components::Component1")).to eq('<span>Components::Component1</span>')
   end
-
 end
 end

spec/react/tutorial/tutorial_spec.rb

@@ -10,21 +10,21 @@ def render
 
 describe 'An Example from the react.rb doc' do
   it 'produces the correct result' do
-    expect(React.render_to_static_markup(React.create_element(HelloMessage))).to eq('<div>Hello World!</div>')
+    expect(render_to_html(HelloMessage)).to eq('<div>Hello World!</div>')
   end
 end
 
 class HelloMessage2
   include React::Component
   define_state(:user_name) { '@catmando' }
   def render
-    div { "Hello #{user_name}" }
+    div { "Hello #{state.user_name}" }
   end
 end
 
 describe 'Adding state to a component (second tutorial example)' do
   it "produces the correct result" do
-    expect(React.render_to_static_markup(React.create_element(HelloMessage2))).to eq('<div>Hello @catmando</div>')
+    expect(render_to_html(HelloMessage2)).to eq('<div>Hello @catmando</div>')
   end
 
   it 'renders to the document' do