File tree Expand file tree Collapse file tree 5 files changed +17
-5
lines changed Expand file tree Collapse file tree 5 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -65,8 +65,8 @@ appraise "rails-5-no_sprockets" do
6565 gem 'rails' , '~> 5.0.0'
6666end
6767
68- appraise "rails-5-sprockets_4" do
69- gem "rails" , "~> 5.0.0 "
68+ appraise "rails-5.1 -sprockets_4" do
69+ gem "rails" , "5.1.0.rc1 "
7070 gem "sprockets" , "~> 4.0.x"
7171 gem "turbolinks" , "~> 5.0.0"
7272end
Original file line number Diff line number Diff line change 33source "http://rubygems.org"
44
55gem "turbolinks", "~> 5.0.0"
6- gem "rails", "~> 5.0.0 "
6+ gem "rails", "5.1.0.rc1 "
77gem "sprockets", "~> 4.0.x"
88
99gemspec :path => "../"
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ class Railtie < ::Rails::Railtie
3333 end
3434
3535 # Rails checks these objects for changes:
36- app . reloaders << app . config . file_watcher . new ( [ ] , reload_paths )
36+ app . reloaders << app . config . file_watcher . new ( [ ] , reload_paths ) { }
3737 # Reload renderers in dev when files change
3838 config . to_prepare { React ::ServerRendering . reset_pool }
3939 end
Original file line number Diff line number Diff line change 11require 'test_helper'
22
33class PagesControllerTest < ActionController ::TestCase
4+ include ParamsHelper
45 setup do
56 WebpackerHelpers . compile_if_missing
67 end
78
89 test 'renders successfully' do
9- get :show , id : 1
10+ get :show , query_params ( id : 1 )
1011 assert_equal ( 200 , response . status )
1112 end
1213
Original file line number Diff line number Diff line change @@ -101,3 +101,14 @@ def when_stateful_js_context_available
101101 yield
102102 end
103103end
104+
105+ module ParamsHelper
106+ # Normalize params for Rails 5.1+
107+ def query_params ( params )
108+ if Rails ::VERSION . to_s > "5.0"
109+ { params : params }
110+ else
111+ params
112+ end
113+ end
114+ end
You can’t perform that action at this time.
0 commit comments