Add explicit message when Git is not installed

shakacode · Jul 9, 2017 · 4dfe76a · 4dfe76a
1 parent b0bb4ef
commit 4dfe76a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/react_on_rails/git_utils.rb b/lib/react_on_rails/git_utils.rb
@@ -8,7 +8,11 @@ def self.uncommitted_changes?(message_handler)
       return false if ENV["COVERAGE"] == "true"
       status = `git status --porcelain`
       return false if $CHILD_STATUS.success? && status.empty?
-      error = "You have uncommitted code. Please commit or stash your changes before continuing"
+      if !$CHILD_STATUS.success?
+        error = "You do not have Git installed. Please install Git, and commit your changes before continuing"
+      else
+        error = "You have uncommitted code. Please commit or stash your changes before continuing"
+      end
       message_handler.add_error(error)
       true
     end

diff --git a/spec/react_on_rails/git_utils_spec.rb b/spec/react_on_rails/git_utils_spec.rb
@@ -44,7 +44,7 @@ module ReactOnRails
           allow(described_class).to receive(:`).with("git status --porcelain").and_return(subject)
           allow_any_instance_of(Process::Status).to receive(:success?).and_return(false)
           expect(message_handler).to receive(:add_error)
-            .with("You have uncommitted code. Please commit or stash your changes before continuing")
+            .with("You do not have Git installed. Please install Git, and commit your changes before continuing")
         end
 
         it "returns true" do