diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:19:52 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:19:52 -0300 |
| commit | 998d21a961b68eb37f5d20c9e96fa5b6a14131b0 (patch) | |
| tree | 7dabd36220c4d34958adab8dabe6111c819eff2f /railties/test | |
| parent | 56f3bbc5b0920e44fcac83ed2d38eb90b3744183 (diff) | |
| parent | 861e7d43e320dec770d353b9aeba625ff7573fda (diff) | |
| download | rails-998d21a961b68eb37f5d20c9e96fa5b6a14131b0.tar.gz rails-998d21a961b68eb37f5d20c9e96fa5b6a14131b0.tar.bz2 rails-998d21a961b68eb37f5d20c9e96fa5b6a14131b0.zip | |
Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascript
convert cable.coffee to cable.js
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/rake_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index 92ae3edc08..dc3c4755c7 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -118,7 +118,7 @@ module ApplicationTests end def test_code_statistics_sanity - assert_match "Code LOC: 16 Test LOC: 0 Code to Test Ratio: 1:0.0", + assert_match "Code LOC: 18 Test LOC: 0 Code to Test Ratio: 1:0.0", Dir.chdir(app_path){ `bin/rails stats` } end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 20b2cd3cca..11b795bc9f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -464,7 +464,7 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator [destination_root, "--skip-action-cable"] assert_file "config/application.rb", /#\s+require\s+["']action_cable\/engine["']/ assert_no_file "config/cable.yml" - assert_no_file "app/assets/javascripts/cable.coffee" + assert_no_file "app/assets/javascripts/cable.js" assert_no_file "app/channels" assert_file "Gemfile" do |content| assert_no_match(/redis/, content) |