change missing_npm? to missing_yarn?

shakacode · Feb 22, 2017 · 4ba9ddf · 4ba9ddf
1 parent 5a2473a
commit 4ba9ddf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/generators/react_on_rails/install_generator.rb b/lib/generators/react_on_rails/install_generator.rb
@@ -60,10 +60,10 @@ def invoke_generators
       # js(.coffee) are not checked by this method, but instead produce warning messages
       # and allow the build to continue
       def installation_prerequisites_met?
-        !(missing_node? || missing_npm? || ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages))
+        !(missing_node? || missing_yarn? || ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages))
       end
 
-      def missing_npm?
+      def missing_yarn?
         return false unless ReactOnRails::Utils.running_on_windows? ? `where yarn`.blank? : `which yarn`.blank?
         error = "yarn is required. Please install it before continuing. "
         error << "https://yarnpkg.com/en/docs/install"

diff --git a/spec/react_on_rails/generators/install_generator_spec.rb b/spec/react_on_rails/generators/install_generator_spec.rb
@@ -138,7 +138,7 @@
     specify "when npm is exist" do
       stub_const("RUBY_PLATFORM", "linux")
       allow(@install_generator).to receive(:`).with("which yarn").and_return("/path/to/bin")
-      expect(@install_generator.send(:missing_npm?)).to eq false
+      expect(@install_generator.send(:missing_yarn?)).to eq false
     end
   end
 
@@ -154,7 +154,7 @@
     specify "when npm is missing" do
       stub_const("RUBY_PLATFORM", "linux")
       allow(@install_generator).to receive(:`).with("which yarn").and_return("")
-      expect(@install_generator.send(:missing_npm?)).to eq true
+      expect(@install_generator.send(:missing_yarn?)).to eq true
     end
   end
 
@@ -170,7 +170,7 @@
     specify "when npm is exist" do
       stub_const("RUBY_PLATFORM", "mswin")
       allow(@install_generator).to receive(:`).with("where yarn").and_return("/path/to/bin")
-      expect(@install_generator.send(:missing_npm?)).to eq false
+      expect(@install_generator.send(:missing_yarn?)).to eq false
     end
   end
 
@@ -186,7 +186,7 @@
     specify "when npm is missing" do
       stub_const("RUBY_PLATFORM", "mswin")
       allow(@install_generator).to receive(:`).with("where yarn").and_return("")
-      expect(@install_generator.send(:missing_npm?)).to eq true
+      expect(@install_generator.send(:missing_yarn?)).to eq true
     end
   end
 end