Merge pull request #697 from reactjs/rails-5-1

feat(Rails) support 5.1

Author: rmosolgo

.travis.yml

@@ -21,7 +21,7 @@ gemfile:
   - gemfiles/rails_4.2_sprockets_2.gemfile
   - gemfiles/rails_4.2_sprockets_3.gemfile
   - gemfiles/rails_5_no_sprockets.gemfile
-  - gemfiles/rails_5_sprockets_4.gemfile
+  - gemfiles/rails_5.1_sprockets_4.gemfile
 
 matrix:
   fast_finish: true
@@ -43,7 +43,7 @@ matrix:
     - rvm: 2.1
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_5_sprockets_4.gemfile
+      gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
     - rvm: jruby-9.0.1.0
       gemfile: gemfiles/rails_4.0.gemfile
     - rvm: jruby-9.0.1.0

Appraisals

@@ -65,8 +65,8 @@ appraise "rails-5-no_sprockets" do
   gem 'rails', '~> 5.0.0'
 end
 
-appraise "rails-5-sprockets_4" do
-  gem "rails", "~> 5.0.0"
+appraise "rails-5.1-sprockets_4" do
+  gem "rails", "5.1.0.rc1"
   gem "sprockets", "~> 4.0.x"
   gem "turbolinks", "~> 5.0.0"
 end

gemfiles/rails_5_sprockets_4.gemfile renamed to gemfiles/rails_5.1_sprockets_4.gemfile

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "turbolinks", "~> 5.0.0"
-gem "rails", "~> 5.0.0"
+gem "rails", "5.1.0.rc1"
 gem "sprockets", "~> 4.0.x"
 
 gemspec :path => "../"

lib/react/rails/railtie.rb

@@ -33,7 +33,7 @@ class Railtie < ::Rails::Railtie
         end
 
         # Rails checks these objects for changes:
-        app.reloaders << app.config.file_watcher.new([], reload_paths)
+        app.reloaders << app.config.file_watcher.new([], reload_paths) {}
         # Reload renderers in dev when files change
         config.to_prepare { React::ServerRendering.reset_pool }
       end

test/dummy/package.json

@@ -21,7 +21,7 @@
     "rails-erb-loader": "^4.0.0",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "react_ujs": "^1.0.0",
+    "react_ujs": "^2.0.2",
     "sass-loader": "^6.0.3",
     "style-loader": "^0.16.1",
     "webpack": "^2.3.3",

test/dummy/yarn.lock

@@ -3450,9 +3450,9 @@ react@^15.4.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react_ujs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/react_ujs/-/react_ujs-1.0.0.tgz#33fbae8cd949fbdd28914d7a0b69bf3c078aa4be"
+react_ujs@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/react_ujs/-/react_ujs-2.0.2.tgz#0020f38fa2e47a04c03faa080325324bfa6d1f0b"
 
 read-cache@^1.0.0:
   version "1.0.0"

test/react/rails/pages_controller_test.rb

@@ -1,12 +1,13 @@
 require 'test_helper'
 
 class PagesControllerTest < ActionController::TestCase
+  include ParamsHelper
   setup do
     WebpackerHelpers.compile_if_missing
   end
 
   test 'renders successfully' do
-    get :show, id: 1
+    get :show, query_params(id: 1)
     assert_equal(200, response.status)
   end
 

test/test_helper.rb

@@ -101,3 +101,14 @@ def when_stateful_js_context_available
     yield
   end
 end
+
+module ParamsHelper
+  # Normalize params for Rails 5.1+
+  def query_params(params)
+    if Rails::VERSION::MAJOR > 4
+      {params: params}
+    else
+      params
+    end
+  end
+end