Migrate tests to use render_static_html matcher

Author: zetachang

spec/react/dsl_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if opal?
-describe 'the React DSL' do
+describe 'the React DSL', type: :component do
 
   context "render macro" do
 
@@ -14,7 +14,7 @@
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div class="foo">hello</div>')
+      expect(Foo).to render_static_html('<div class="foo">hello</div>')
     end
 
     it "can define the render method with the render macro without a container" do
@@ -26,7 +26,7 @@
         end
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span>hello</span>')
+      expect(Foo).to render_static_html('<span>hello</span>')
     end
 
     it "can define the render method with the render macro with a application defined container" do
@@ -40,7 +40,7 @@
         render Bar, p1: "fred"
       end
 
-      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span>hello fred</span>')
+      expect(Foo).to render_static_html('<span>hello fred</span>')
     end
   end
 
@@ -53,7 +53,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>hello</div>')
+    expect(Foo).to render_static_html('<div>hello</div>')
   end
 
   it "will pass converted props through event handlers" do
@@ -77,7 +77,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>hello</div>')
+    expect(Foo).to render_static_html('<div>hello</div>')
   end
 
   it "has a .span short hand String method" do
@@ -89,7 +89,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(Foo).to render_static_html('<div><span>hello</span><span>goodby</span></div>')
   end
 
   it "has a .br short hand String method" do
@@ -113,7 +113,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(Foo).to render_static_html('<table><tr><td>hello</td></tr></table>')
   end
 
   it "has a .para short hand String method" do
@@ -125,7 +125,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div><p>hello</p></div>')
+    expect(Foo).to render_static_html('<div><p>hello</p></div>')
   end
 
   it 'can do a method call on a class name that is not a direct sibling' do
@@ -141,8 +141,8 @@ def render
         Comp()
       end
     end
-    expect(React.render_to_static_markup(React.create_element(Mod::NestedMod::NestedComp)))
-      .to eq('<span>Mod::Comp</span>')
+    expect(Mod::NestedMod::NestedComp)
+      .to render_static_html('<span>Mod::Comp</span>')
   end
 
   it 'raises a meaningful error if a Constant Name is not actually a component' do
@@ -187,7 +187,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(Foo).to render_static_html('<span>a man walks into a bar</span>')
   end
 
   it "can add class names by the haml .class notation" do
@@ -206,7 +206,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span class="other-class the-class">a man walks into a bar</span>')
+    expect(Foo).to render_static_html('<span class="other-class the-class">a man walks into a bar</span>')
   end
 
   it "can use the 'class' keyword for classes" do
@@ -218,7 +218,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span class="the-class">hello</span>')
+    expect(Foo).to render_static_html('<span class="the-class">hello</span>')
   end
 
   it "can generate a unrendered node using the .as_node method" do          # div { "hello" }.as_node
@@ -230,7 +230,8 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span data-size="12">React::Element</span>')
+    expect(Foo)
+    .to render_static_html('<span data-size="12">React::Element</span>')
   end
 
   it "can use the dangerously_set_inner_HTML param" do
@@ -242,7 +243,7 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>Hello&nbsp;&nbsp;Goodby</div>')
+    expect(Foo).to render_static_html('<div>Hello&nbsp;&nbsp;Goodby</div>')
   end
 
   it 'should convert a hash param to hyphenated html attributes if in React::HASH_ATTRIBUTES' do
@@ -254,8 +255,8 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo)))
-      .to eq('<div data-foo="bar" aria-foo-bar="foo"></div>')
+    expect(Foo)
+      .to render_static_html('<div data-foo="bar" aria-foo-bar="foo"></div>')
   end
 
   it 'should not convert a hash param to hyphenated html attributes if not in React::HASH_ATTRIBUTES' do
@@ -267,8 +268,10 @@ def render
       end
     end
 
-    expect(React.render_to_static_markup(React.create_element(Foo)))
-      .to eq('<div title="{&quot;bar&quot;=&gt;&quot;foo&quot;}"></div>')
+    expect(Foo)
+      .to render_static_html(
+        '<div title="{&quot;bar&quot;=&gt;&quot;foo&quot;}"></div>'
+      )
   end
 
   it "will remove all elements passed as params from the rendering buffer" do
@@ -290,7 +293,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(Test).to render_static_html('<div><b>hello</b><b>hello</b></div>')
   end
 end
 end

spec/react/element_spec.rb

@@ -3,7 +3,7 @@
 if opal?
 # require 'reactrb/new-event-name-convention' # this require will get rid of any error messages but
 # the on method will no longer attach to the param prefixed with _on
-describe React::Element do
+describe React::Element, type: :component do
   it 'bridges `type` of native React.Element attributes' do
     element = React.create_element('div')
     expect(element.element_type).to eq("div")

spec/react/native_library_spec.rb

@@ -17,7 +17,7 @@ class NestedComponent < React::Component::Base
   end
 end
 
-describe "React::NativeLibrary" do
+describe "React::NativeLibrary", type: :component do
 
   after(:each) do
     %x{
@@ -52,8 +52,7 @@ class NestedComponent < React::Component::Base
       Foo.class_eval do
         imports "NativeLibrary.FunctionalComponent"
       end
-      expect(React.render_to_static_markup(
-        React.create_element(Foo, name: "There"))).to eq('<div>Hello There</div>')
+      expect(Foo).to render_static_html('<div>Hello There</div>').with_params(name: "There")
     end
   end
 
@@ -87,8 +86,8 @@ class NestedComponent < React::Component::Base
     Foo.class_eval do
       imports "NativeLibrary"
     end
-    expect(React.render_to_static_markup(
-      React.create_element(Foo::NativeComponent, name: "There"))).to eq('<div>Hello There</div>')
+    expect(Foo::NativeComponent)
+      .to render_static_html('<div>Hello There</div>').with_params(name: "There")
   end
 
   it "will import a nested React.js library into the Ruby name space" do
@@ -107,8 +106,8 @@ class NestedComponent < React::Component::Base
     Foo.class_eval do
       imports "NativeLibrary"
     end
-    expect(React.render_to_static_markup(
-      React.create_element(Foo::NestedLibrary::NativeComponent, name: "There"))).to eq('<div>Hello There</div>')
+    expect(Foo::NestedLibrary::NativeComponent)
+      .to render_static_html('<div>Hello There</div>').with_params(name: "There")
   end
 
   it "will rename an imported a React.js component" do
@@ -127,8 +126,8 @@ class NestedComponent < React::Component::Base
       imports "NativeLibrary"
       rename "NativeComponent" => "Bar"
     end
-    expect(React.render_to_static_markup(
-      React.create_element(Foo::Bar, name: "There"))).to eq('<div>Hello There</div>')
+    expect(Foo::Bar)
+      .to render_static_html('<div>Hello There</div>').with_params(name: "There")
   end
 
   it "will give a reasonable error when failing to import a renamed component" do
@@ -164,8 +163,8 @@ class NestedComponent < React::Component::Base
     Foo.class_eval do
       imports "NativeComponent"
     end
-    expect(React.render_to_static_markup(
-      React.create_element(Foo, name: "There"))).to eq('<div>Hello There</div>')
+    expect(Foo)
+      .to render_static_html('<div>Hello There</div>').with_params(name: "There")
 
   end
 
@@ -184,8 +183,8 @@ class NestedComponent < React::Component::Base
     Foo.class_eval do
       imports "NativeLibrary.NativeComponent"
     end
-    expect(React.render_to_static_markup(
-      React.create_element(Foo, name: "There"))).to eq('<div>Hello There</div>')
+    expect(Foo)
+      .to render_static_html('<div>Hello There</div>').with_params(name: "There")
 
   end
 
@@ -234,8 +233,7 @@ class NestedComponent < React::Component::Base
           }
         })
       }
-      expect(React.render_to_static_markup(
-        React.create_element(Foo))).to eq('<div>Hello There</div>')
+      expect(Foo).to render_static_html('<div>Hello There</div>')
     end
 
     it 'will automatically import a React.js component when referenced in another component with the _as_node suffix' do
@@ -254,8 +252,7 @@ class NestedComponent < React::Component::Base
           }
         })
       }
-      expect(React.render_to_static_markup(
-        React.create_element(Foo))).to eq('<div><div>Hello There</div><div>Hello There</div></div>')
+      expect(Foo).to render_static_html('<div><div>Hello There</div><div>Hello There</div></div>')
     end
 
     it "will automatically import a React.js component in a library when referenced in another component with the _as_node suffix" do
@@ -276,8 +273,7 @@ class NestedComponent < React::Component::Base
           })
         }
       }
-      expect(React.render_to_static_markup(
-        React.create_element(Foo))).to eq('<div><div>Hello There</div><div>Hello There</div></div>')
+      expect(Foo).to render_static_html('<div><div>Hello There</div><div>Hello There</div></div>')
     end
 
     it "will automatically import a React.js component when referenced as a constant" do
@@ -289,8 +285,8 @@ class NestedComponent < React::Component::Base
           }
         })
       }
-      expect(React.render_to_static_markup(
-        React.create_element(NativeComponent, name: "There"))).to eq('<div>Hello There</div>')
+      expect(NativeComponent)
+        .to render_static_html('<div>Hello There</div>').with_params(name: "There")
     end
 
     it "will automatically import a native library containing a React.js component" do
@@ -322,8 +318,8 @@ class NestedComponent < React::Component::Base
           })
         }
       }
-      expect(React.render_to_static_markup(
-        React.create_element(NativeLibrary::NativeComponent, name: "There"))).to eq('<div>Hello There</div>')
+      expect(NativeLibrary::NativeComponent)
+        .to render_static_html('<div>Hello There</div>').with_params(name: "There")
     end
 
     it "will produce a sensible error if the component is not in the library" do

spec/react/param_declaration_spec.rb

@@ -190,7 +190,7 @@ def render
             "#{params.foo.kind}"
           end
         end
-        expect(React.render_to_static_markup(React.create_element(Foo, foo: {bazwoggle: 1}))).to eq('<span>2</span>')
+        expect(Foo).to render_static_html('<span>2</span>').with_params(foo: {bazwoggle: 1})
       end
 
       it "even if contains an embedded native object" do

spec/react/top_level_component_spec.rb

@@ -39,8 +39,13 @@ def render
 end
 
 def render_top_level(controller, component_name)
-  render_to_html(React::TopLevelRailsComponent, controller: controller,
-                 component_name: component_name, render_params: {})
+  params = {
+    controller: controller,
+    component_name: component_name,
+    render_params: {}
+  }
+  element = React.create_element(React::TopLevelRailsComponent, params)
+  React.render_to_static_markup(element)
 end
 
 describe React::TopLevelRailsComponent do

spec/support/react/spec_helpers.rb

@@ -3,10 +3,6 @@ module React
   module SpecHelpers
     `var ReactTestUtils = React.addons.TestUtils`
 
-    def render_to_html(type, options = {})
-      element = React.create_element(type, options)
-      React.render_to_static_markup(element)
-    end
 
     def renderToDocument(type, options = {})
       element = React.create_element(type, options)