kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix tests related to new JavaScript path for generators

Browse source 
- Followup of 4838c1716a
This commit is contained in:
Prathamesh Sonpatki 2018-10-05 20:44:58 +05:30
parent 1ceaf7db50
commit 2690c41dec
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/test/generators/app_generator_test.rb
View file

@ -603,7 +603,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_javascript_is_skipped_if_required def test_javascript_is_skipped_if_required
run_generator [destination_root, "--skip-javascript"] run_generator [destination_root, "--skip-javascript"]
assert_no_file "app/assets/javascripts" assert_no_file "app/javascript"
assert_file "app/views/layouts/application.html.erb" do |contents| assert_file "app/views/layouts/application.html.erb" do |contents|
assert_match(/stylesheet_link_tag\s+'application', media: 'all' %>/, contents) assert_match(/stylesheet_link_tag\s+'application', media: 'all' %>/, contents)

6
railties/test/generators/channel_generator_test.rb
View file

@ -57,7 +57,7 @@ class ChannelGeneratorTest < Rails::Generators::TestCase
assert_no_file "app/javascript/channels/chat_channel.js" assert_no_file "app/javascript/channels/chat_channel.js"
end end
def test_cable_js_is_created_if_not_present_already def test_consumer_js_is_created_if_not_present_already
run_generator ["chat"] run_generator ["chat"]
FileUtils.rm("#{destination_root}/app/javascript/channels/index.js") FileUtils.rm("#{destination_root}/app/javascript/channels/index.js")
FileUtils.rm("#{destination_root}/app/javascript/channels/consumer.js") FileUtils.rm("#{destination_root}/app/javascript/channels/consumer.js")
@ -72,7 +72,7 @@ class ChannelGeneratorTest < Rails::Generators::TestCase
run_generator ["chat"], behavior: :revoke run_generator ["chat"], behavior: :revoke
assert_no_file "app/channels/chat_channel.rb" assert_no_file "app/channels/chat_channel.rb"
assert_no_file "app/assets/javascripts/channels/chat.js" assert_no_file "app/javascript/channels/chat_channel.js"
assert_file "app/channels/application_cable/channel.rb" assert_file "app/channels/application_cable/channel.rb"
assert_file "app/channels/application_cable/connection.rb" assert_file "app/channels/application_cable/connection.rb"
@ -86,7 +86,7 @@ class ChannelGeneratorTest < Rails::Generators::TestCase
assert_no_file "app/channels/chat_channel_channel.rb" assert_no_file "app/channels/chat_channel_channel.rb"
assert_file "app/channels/chat_channel.rb" assert_file "app/channels/chat_channel.rb"
assert_no_file "app/assets/javascripts/channels/chat_channel.js" assert_no_file "app/javascript/channels/chat_channel_channel.js"
assert_file "app/javascript/channels/chat_channel.js" assert_file "app/javascript/channels/chat_channel.js"
end end
end end

2
railties/test/generators/controller_generator_test.rb
View file

@ -130,8 +130,6 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
assert_no_file "app/helpers/account_controller_helper.rb" assert_no_file "app/helpers/account_controller_helper.rb"
assert_file "app/helpers/account_helper.rb" assert_file "app/helpers/account_helper.rb"
assert_no_file "app/assets/javascripts/account_controller.js"
assert_no_file "app/assets/stylesheets/account_controller.css" assert_no_file "app/assets/stylesheets/account_controller.css"
assert_file "app/assets/stylesheets/account.css" assert_file "app/assets/stylesheets/account.css"
end end

4
railties/test/generators/shared_generator_tests.rb
View file

@ -305,8 +305,8 @@ module SharedGeneratorTests
run_generator [destination_root, "--skip-action-cable"] run_generator [destination_root, "--skip-action-cable"]
assert_file "#{application_path}/config/application.rb", /#\s+require\s+["']action_cable\/engine["']/ assert_file "#{application_path}/config/application.rb", /#\s+require\s+["']action_cable\/engine["']/
assert_no_file "#{application_path}/config/cable.yml" assert_no_file "#{application_path}/config/cable.yml"
assert_no_file "#{application_path}/app/assets/javascripts/cable.js" assert_no_file "#{application_path}/app/javascript/consumer.js"
assert_no_directory "#{application_path}/app/assets/javascripts/channels" assert_no_directory "#{application_path}/app/javascript/channels"
assert_no_directory "#{application_path}/app/channels" assert_no_directory "#{application_path}/app/channels"
assert_file "Gemfile" do |content| assert_file "Gemfile" do |content|
assert_no_match(/redis/, content) assert_no_match(/redis/, content)