Skip to content

Commit eb74382

Browse files
committed
Merge branch 'master' into fix/assert-react-component-with-multiple-case
2 parents 855b528 + c86cfa1 commit eb74382

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Gem](https://img.shields.io/gem/v/react-rails.svg?style=flat-square)](http://rubygems.org/gems/react-rails)
44
[![npm](https://img.shields.io/npm/v/react_ujs.svg?style=flat-square)](https://www.npmjs.com/package/react_ujs)
55
[![Build Status](https://img.shields.io/travis/reactjs/react-rails/master.svg?style=flat-square)](https://travis-ci.org/reactjs/react-rails)
6-
[![Code Climate](https://img.shields.io/codeclimate/github/reactjs/react-rails.svg?style=flat-square)](https://codeclimate.com/github/reactjs/react-rails)
6+
[![Maintainers Wanted](https://img.shields.io/badge/Maintainers-Wanted-red.svg)
77

88

99
React-Rails is a flexible tool to use [React](http://facebook.github.io/react/) with Rails. The benefits:

test/react/rails/pages_controller_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ class PagesControllerTest < ActionController::TestCase
1313

1414
when_stateful_js_context_available do
1515
test 'it sets up and tears down a react context' do
16-
get :show, id: 1, prerender: true
16+
get :show, query_params(id: 1, prerender: true)
1717
assert_includes(response.body, 'Hello')
1818

19-
get :show, id: 1, prerender: true, greeting: 'Howdy'
19+
get :show, query_params(id: 1, prerender: true, greeting: 'Howdy')
2020
assert_includes(response.body, 'Howdy')
2121

22-
get :show, id: 1, prerender: true, greeting: '👋'
22+
get :show, query_params(id: 1, prerender: true, greeting: '👋')
2323
assert_includes(response.body, '👋')
2424

25-
get :show, id: 1, prerender: true
25+
get :show, query_params(id: 1, prerender: true)
2626
assert_includes(response.body, 'Hello')
2727
end
2828
end
2929

3030
WebpackerHelpers.when_webpacker_available do
3131
test 'it mounts components from the dev server' do
3232
WebpackerHelpers.with_dev_server do
33-
get :show, id: 1, prerender: true
33+
get :show, query_params(id: 1, prerender: true)
3434
assert_match /Hello<!--.*--> from Webpacker/, response.body
35-
get :show, id: 1, prerender: true, greeting: 'Howdy'
35+
get :show, query_params(id: 1, prerender: true, greeting: 'Howdy')
3636
assert_match /Howdy<!--.*--> from Webpacker/, response.body
3737
end
3838
end

0 commit comments

Comments
 (0)