Deprecate render matcher in favor of render_static_html

Author: zetachang

lib/react/test/matchers/render_html_matcher.rb

@@ -41,7 +41,12 @@ def failure_string(negative = false)
         end
       end
 
+      def render_static_html(*args)
+        RenderHTMLMatcher.new(*args)
+      end
+
       def render(*args)
+        %x{ console.error("Warning: `render` matcher is deprecated in favor of `render_static_html`."); }
         RenderHTMLMatcher.new(*args)
       end
     end

spec/react/component/base_spec.rb

@@ -25,8 +25,8 @@ def render
         @instance_data.join(" ")
       end
     end
-    expect(Foo).to render("<span>working</span>")
-    expect(Bar).to render("<span>working well</span>")
+    expect(Foo).to render_static_html("<span>working</span>")
+    expect(Bar).to render_static_html("<span>working well</span>")
   end
 end
 end

spec/react/component_spec.rb

@@ -123,7 +123,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>bar</div>')
+      expect(Foo).to render_static_html('<div>bar</div>')
     end
 
     it 'allows kernal method names like "format" to be used as state variable names' do
@@ -134,7 +134,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>yes</div>')
+      expect(Foo).to render_static_html('<div>yes</div>')
     end
 
     it 'returns an observer with the bang method and no arguments' do
@@ -144,7 +144,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>React::Observable</div>')
+      expect(Foo).to render_static_html('<div>React::Observable</div>')
     end
 
     it 'returns the current value of a state when written' do
@@ -155,15 +155,15 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>bar</div>')
+      expect(Foo).to render_static_html('<div>bar</div>')
     end
 
     it 'can access an explicitly defined state`' do
       Foo.class_eval do
         define_state foo: :bar
       end
 
-      expect(Foo).to render('<div>bar</div>')
+      expect(Foo).to render_static_html('<div>bar</div>')
     end
 
   end
@@ -307,7 +307,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>bar</div>')
+      expect(Foo).to render_static_html('<div>bar</div>')
     end
 
     it 'transforms state getter to Ruby object' do
@@ -323,7 +323,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div>Hello</div>')
+      expect(Foo).to render_static_html('<div>Hello</div>')
     end
   end
 
@@ -473,8 +473,8 @@ def render
           end
         end
 
-        expect(Foo).to render('<div>lorem-bar</div>').with_params(foo: 'lorem')
-        expect(Foo).to render('<div>foo-bar</div>')
+        expect(Foo).to render_static_html('<div>lorem-bar</div>').with_params(foo: 'lorem')
+        expect(Foo).to render_static_html('<div>foo-bar</div>')
       end
     end
   end
@@ -688,7 +688,7 @@ def render
         end
       end
 
-      expect(Bar).to render('<div><div><span>astring</span></div></div>')
+      expect(Bar).to render_static_html('<div><div><span>astring</span></div></div>')
     end
 
     it 'builds single node in top-level render without providing a block' do
@@ -701,7 +701,7 @@ def render
         end
       end
 
-      expect(Foo).to render('<div></div>')
+      expect(Foo).to render_static_html('<div></div>')
     end
 
     it 'redefines `p` to make method missing work' do
@@ -719,7 +719,7 @@ def render
       end
 
       markup = '<p class="foo"><p></p><div>lorem ipsum</div><p id="10"></p></p>'
-      expect(Foo).to render(markup)
+      expect(Foo).to render_static_html(markup)
     end
 
     it 'only overrides `p` in render context' do

spec/react/param_declaration_spec.rb

@@ -12,7 +12,7 @@ def render
       end
     end
 
-    expect(Foo).to render('<div>biz</div>').with_params(bar: 'biz')
+    expect(Foo).to render_static_html('<div>biz</div>').with_params(bar: 'biz')
   end
 
   it "can create and access a required param" do
@@ -25,7 +25,7 @@ def render
       end
     end
 
-    expect(Foo).to render('<div>bar</div>').with_params(foo: :bar)
+    expect(Foo).to render_static_html('<div>bar</div>').with_params(foo: :bar)
   end
 
   it "can create and access an optional params" do
@@ -42,7 +42,7 @@ def render
       end
     end
 
-    expect(Foo).to render('<div>bar1-no_bar2-bar3-no_bar4</div>').with_params(foo1: :bar1, foo3: :bar3)
+    expect(Foo).to render_static_html('<div>bar1-no_bar2-bar3-no_bar4</div>').with_params(foo1: :bar1, foo3: :bar3)
   end
 
   it 'can specify validation rules with the type option' do
@@ -66,7 +66,7 @@ def render
       end
     end
 
-    expect(Foo).to render('<div>12-string</div>').with_params(foo1: 12, foo2: "string")
+    expect(Foo).to render_static_html('<div>12-string</div>').with_params(foo1: 12, foo2: "string")
   end
 
   it 'logs error in warning if validation failed' do
@@ -167,7 +167,7 @@ def render
       end
 
       params = { foo: "", bar: { bazwoggle: 1 }, baz: [{ bazwoggle: 2 }] }
-      expect(Foo).to render('<span>1, 2</span>').with_params(params)
+      expect(Foo).to render_static_html('<span>1, 2</span>').with_params(params)
       expect(`window.dummy_log[0]`).to match(/Warning: Failed prop( type|Type): In component `Foo`\nProvided prop `foo` could not be converted to BazWoggle/)
     end
 
@@ -235,7 +235,7 @@ def render
           params.foo
         end
       end
-      expect(Foo).to render('<span>works!</span>').with_params(foo: lambda { 'works!' })
+      expect(Foo).to render_static_html('<span>works!</span>').with_params(foo: lambda { 'works!' })
     end
 
     it "will create a 'bang' (i.e. update) method if the type is React::Observable" do
@@ -250,7 +250,7 @@ def render
       end
       current_state = ""
       observer = React::Observable.new(current_state) { |new_state| current_state = new_state }
-      expect(Foo).to render('<span>ha!</span>').with_params(foo: observer)
+      expect(Foo).to render_static_html('<span>ha!</span>').with_params(foo: observer)
       expect(current_state).to eq("ha!")
     end
   end

spec/react/react_spec.rb

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

spec/react/test/rspec_spec.rb

@@ -23,7 +23,7 @@ def render
     end
 
     it 'includes rspec matchers' do
-      expect(Greeter).to render(
+      expect(Greeter).to render_static_html(
         '<span>Hello world</span>'
       ).with_params(message: 'world')
     end

spec/react/tutorial/tutorial_spec.rb

@@ -10,7 +10,7 @@ def render
 
 describe 'An Example from the react.rb doc', type: :component do
   it 'produces the correct result' do
-    expect(HelloMessage).to render('<div>Hello World!</div>')
+    expect(HelloMessage).to render_static_html('<div>Hello World!</div>')
   end
 end
 
@@ -24,7 +24,7 @@ def render
 
 describe 'Adding state to a component (second tutorial example)', type: :component do
   it "produces the correct result" do
-    expect(HelloMessage2).to render('<div>Hello @catmando</div>')
+    expect(HelloMessage2).to render_static_html('<div>Hello @catmando</div>')
   end
 
   it 'renders to the document' do