Merge pull request #114 from larouxn/rails_6_support

Rails 6 support
rails · Apr 23, 2019 · 74214e8 · 74214e8
2 parents 5df5816 + eff9c00
commit 74214e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in coffee-rails.gemspec
 gemspec
 
-gem 'rails', git: 'https://github.com/rails/rails'
+gem 'rails', git: 'https://github.com/larouxn/rails', branch: 'resurrection'
diff --git a/test/assets_generator_test.rb b/test/assets_generator_test.rb
@@ -8,7 +8,7 @@ class AssetGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
 
   def test_assets
-    run_generator %w(posts)
+    run_generator %w(posts --javascript-engine=coffee)
     assert_no_file "app/assets/javascripts/posts.js"
     assert_file "app/assets/javascripts/posts.coffee"
   end