From 89822e86d8da3771f5a72c2d33888af76aec9d6e Mon Sep 17 00:00:00 2001 From: Liceth Ovalles Date: Sun, 20 Nov 2016 16:35:37 -0500 Subject: Add package.json for Yarn if --yarn option is added --- railties/test/generators/app_generator_test.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'railties/test/generators') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 2d01da7f46..f673058de8 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -494,6 +494,11 @@ class AppGeneratorTest < Rails::Generators::TestCase end end + def test_generator_if_yarn_option_is_given + run_generator([destination_root, "--yarn"]) + assert_file "package.json", /dependencies/ + end + def test_inclusion_of_jbuilder run_generator assert_gem "jbuilder" @@ -614,6 +619,10 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_generates_with_bundler end + def test_generation_runs_yarn_install_with_yarn_option + assert_generates_with_yarn yarn: true + end + def test_dev_option assert_generates_with_bundler dev: true rails_path = File.expand_path("../../..", Rails.root) @@ -839,4 +848,18 @@ class AppGeneratorTest < Rails::Generators::TestCase quietly { generator.invoke_all } end end + + def assert_generates_with_yarn(options = {}) + generator([destination_root], options) + + command_check = -> command do + @install_called ||= 0 + @install_called += 1 + assert_equal 1, @install_called, "install expected to be called once, but was called #{@install_called} times" + end + + generator.stub :yarn_command, command_check do + quietly { generator.invoke_all } + end + end end -- cgit v1.2.3 From e6730c7ffbf51c985611d9281e3d080880eb3366 Mon Sep 17 00:00:00 2001 From: Liceth Ovalles Date: Sun, 20 Nov 2016 16:37:06 -0500 Subject: Add node_modules path to assets load paths when --yarn option is used --- railties/test/generators/app_generator_test.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'railties/test/generators') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index f673058de8..d7b682c5a9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -497,6 +497,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_if_yarn_option_is_given run_generator([destination_root, "--yarn"]) assert_file "package.json", /dependencies/ + assert_file "config/initializers/assets.rb", /node_modules/ end def test_inclusion_of_jbuilder -- cgit v1.2.3