Skip to content

Commit 23c4617

Browse files
committed
CI fixes
1 parent ced2f90 commit 23c4617

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

test/react/rails/pages_controller_test.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ class PagesControllerTest < ActionController::TestCase
77
end
88

99
test 'renders successfully' do
10-
get :show, query_params(id: 1)
10+
get :show, params: {id: 1}
1111
assert_equal(200, response.status)
1212
end
1313

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

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

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

25-
get :show, query_params(id: 1, prerender: true)
25+
get :show, 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, query_params(id: 1, prerender: true)
33+
get :show, params: {id: 1, prerender: true}
3434
assert_match /Hello<!--.*--> from Webpacker/, response.body
35-
get :show, query_params(id: 1, prerender: true, greeting: 'Howdy')
35+
get :show, params: {id: 1, prerender: true, greeting: 'Howdy'}
3636
assert_match /Howdy<!--.*--> from Webpacker/, response.body
3737
end
3838
end

test/react/server_rendering/webpacker_containers_test.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ class WebpackerManifestContainerTest < ActiveSupport::TestCase
99

1010
def test_it_loads_JS_from_the_webpacker_container
1111
WebpackerHelpers.compile
12-
container = React::ServerRendering::WebpackerManifestContainer.new
13-
assert_not_empty container.find_asset('application.js')
1412
container = React::ServerRendering::SeparateServerBundleContainer.new
1513
assert_not_empty container.find_asset('server_rendering.js')
1614
end
1715

1816
def test_it_loads_from_webpack_dev_server
1917
WebpackerHelpers.with_dev_server do
20-
container = React::ServerRendering::WebpackerManifestContainer.new
21-
assert_not_empty container.find_asset('application.js')
18+
container = React::ServerRendering::SeparateServerBundleContainer.new
19+
assert_not_empty container.find_asset('server_rendering.js')
2220
end
2321
end
2422
end

test/support/webpacker_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def with_dev_server
4343

4444
# Start the server in a forked process:
4545
Dir.chdir("test/#{DUMMY_LOCATION}") do
46-
spawn 'RAILS_ENV=development ./bin/webpack-dev-server '
46+
spawn 'RAILS_ENV=development ./bin/webpacker-dev-server'
4747
end
4848

4949
stop_time = Time.now + 30.seconds

0 commit comments

Comments
 (0)