Commit 698bcc5

committed

feat(Rails) support 5.1

1 parent fc7b165 commit 698bcc5Copy full SHA for 698bcc5

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ appraise "rails-5-no_sprockets" do`
`65`	`65`	`gem 'rails', '~> 5.0.0'`
`66`	`66`	`end`
`67`	`67`
`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"`
`70`	`70`	`gem "sprockets", "~> 4.0.x"`
`71`	`71`	`gem "turbolinks", "~> 5.0.0"`
`72`	`72`	`end`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class Railtie < ::Rails::Railtie`
`33`	`33`	`end`
`34`	`34`
`35`	`35`	`# 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){}`
`37`	`37`	`# Reload renderers in dev when files change`
`38`	`38`	`config.to_prepare { React::ServerRendering.reset_pool }`
`39`	`39`	`end`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`require 'test_helper'`
`2`	`2`
`3`	`3`	`class PagesControllerTest < ActionController::TestCase`
	`4`	`+ include ParamsHelper`
`4`	`5`	`setup do`
`5`	`6`	`WebpackerHelpers.compile_if_missing`
`6`	`7`	`end`
`7`	`8`
`8`	`9`	`test 'renders successfully' do`
`9`		`- get :show, id: 1`
	`10`	`+ get :show, query_params(id: 1)`
`10`	`11`	`assert_equal(200, response.status)`
`11`	`12`	`end`
`12`	`13`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,3 +101,14 @@ def when_stateful_js_context_available`
`101`	`101`	`yield`
`102`	`102`	`end`
`103`	`103`	`end`
	`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`

Comments

(0)