From 415823159cd590784cf61c3b298b6416e3715c65 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 1 Apr 2019 21:50:32 +0800 Subject: [PATCH] Keep variable name on assert_react_component props. We need make sure the prop name is correct, because JavaScript used that it's case sensitive. --- lib/react/rails/test_helper.rb | 1 - test/dummy_sprockets/app/views/pages/show.html.erb | 2 +- test/dummy_webpacker1/app/views/pages/show.html.erb | 2 +- test/dummy_webpacker2/app/views/pages/show.html.erb | 2 +- test/dummy_webpacker3/app/views/pages/show.html.erb | 2 +- test/react/rails/test_helper_test.rb | 3 ++- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/react/rails/test_helper.rb b/lib/react/rails/test_helper.rb index b54f6e78b..d79b358b3 100644 --- a/lib/react/rails/test_helper.rb +++ b/lib/react/rails/test_helper.rb @@ -12,7 +12,6 @@ def assert_react_component(name) assert_select "div[data-react-class=?]", name do |dom| if block_given? props = JSON.parse(dom.attr("data-react-props")) - props.deep_transform_keys! { |key| key.to_s.underscore } props.deep_symbolize_keys! yield(props) diff --git a/test/dummy_sprockets/app/views/pages/show.html.erb b/test/dummy_sprockets/app/views/pages/show.html.erb index 4c46b12d2..63b4a2bee 100644 --- a/test/dummy_sprockets/app/views/pages/show.html.erb +++ b/test/dummy_sprockets/app/views/pages/show.html.erb @@ -4,7 +4,7 @@
- <%= react_component 'GreetingMessage', { name: @name, last_name: "Last #{@name}", info: { name: @name } }, { id: 'component', class: "greeting-message", prerender: @prerender } %> + <%= react_component 'GreetingMessage', { name: @name, lastName: "Last #{@name}", info: { name: @name, lastName: "Last #{@name}" } }, { id: 'component', class: "greeting-message", prerender: @prerender } %> diff --git a/test/dummy_webpacker1/app/views/pages/show.html.erb b/test/dummy_webpacker1/app/views/pages/show.html.erb index 4c46b12d2..63b4a2bee 100644 --- a/test/dummy_webpacker1/app/views/pages/show.html.erb +++ b/test/dummy_webpacker1/app/views/pages/show.html.erb @@ -4,7 +4,7 @@
- <%= react_component 'GreetingMessage', { name: @name, last_name: "Last #{@name}", info: { name: @name } }, { id: 'component', class: "greeting-message", prerender: @prerender } %> + <%= react_component 'GreetingMessage', { name: @name, lastName: "Last #{@name}", info: { name: @name, lastName: "Last #{@name}" } }, { id: 'component', class: "greeting-message", prerender: @prerender } %>
    <%= react_component 'Todo', { todo: 'Another Component' }, { id: 'todo', prerender: @prerender } %>
diff --git a/test/dummy_webpacker2/app/views/pages/show.html.erb b/test/dummy_webpacker2/app/views/pages/show.html.erb index 4c46b12d2..63b4a2bee 100644 --- a/test/dummy_webpacker2/app/views/pages/show.html.erb +++ b/test/dummy_webpacker2/app/views/pages/show.html.erb @@ -4,7 +4,7 @@
- <%= react_component 'GreetingMessage', { name: @name, last_name: "Last #{@name}", info: { name: @name } }, { id: 'component', class: "greeting-message", prerender: @prerender } %> + <%= react_component 'GreetingMessage', { name: @name, lastName: "Last #{@name}", info: { name: @name, lastName: "Last #{@name}" } }, { id: 'component', class: "greeting-message", prerender: @prerender } %>
    <%= react_component 'Todo', { todo: 'Another Component' }, { id: 'todo', prerender: @prerender } %>
diff --git a/test/dummy_webpacker3/app/views/pages/show.html.erb b/test/dummy_webpacker3/app/views/pages/show.html.erb index 4c46b12d2..63b4a2bee 100644 --- a/test/dummy_webpacker3/app/views/pages/show.html.erb +++ b/test/dummy_webpacker3/app/views/pages/show.html.erb @@ -4,7 +4,7 @@
- <%= react_component 'GreetingMessage', { name: @name, last_name: "Last #{@name}", info: { name: @name } }, { id: 'component', class: "greeting-message", prerender: @prerender } %> + <%= react_component 'GreetingMessage', { name: @name, lastName: "Last #{@name}", info: { name: @name, lastName: "Last #{@name}" } }, { id: 'component', class: "greeting-message", prerender: @prerender } %>
    <%= react_component 'Todo', { todo: 'Another Component' }, { id: 'todo', prerender: @prerender } %>
diff --git a/test/react/rails/test_helper_test.rb b/test/react/rails/test_helper_test.rb index f0ca26593..e80dab106 100644 --- a/test/react/rails/test_helper_test.rb +++ b/test/react/rails/test_helper_test.rb @@ -11,8 +11,9 @@ class TestHelperTest < ActionDispatch::IntegrationTest assert_react_component "GreetingMessage" assert_react_component "GreetingMessage" do |props| assert_equal "Bob", props[:name] - assert_equal "Last Bob", props[:last_name] + assert_equal "Last Bob", props[:lastName] assert_equal "Bob", props[:info][:name] + assert_equal "Last Bob", props[:info][:lastName] assert_select "[id=?]", "component" assert_select "[class=?]", "greeting-message"