From 290ce57f275bdc08494595a56f14431e7e313349 Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Fri, 9 Jun 2017 12:08:41 -0700 Subject: [PATCH] change check for ENV COVERAGE to check value --- .../react_on_rails/templates/dev_tests/spec/simplecov_helper.rb | 2 +- lib/react_on_rails/git_utils.rb | 2 +- spec/dummy/spec/simplecov_helper.rb | 2 +- spec/react_on_rails/simplecov_helper.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb b/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb index c6c26f683..37b08a999 100644 --- a/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb +++ b/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb @@ -2,7 +2,7 @@ # Starts SimpleCov for code coverage. -if ENV["COVERAGE"] +if ENV["COVERAGE"] == "true" require "simplecov" # Using a command name prevents results from getting clobbered by other test suites diff --git a/lib/react_on_rails/git_utils.rb b/lib/react_on_rails/git_utils.rb index 41805d941..236bd4ff3 100644 --- a/lib/react_on_rails/git_utils.rb +++ b/lib/react_on_rails/git_utils.rb @@ -3,7 +3,7 @@ module ReactOnRails module GitUtils def self.uncommitted_changes?(message_handler) - return false if ENV["COVERAGE"] + return false if ENV["COVERAGE"] == "true" status = `git status --porcelain` return false if status.empty? error = "You have uncommitted code. Please commit or stash your changes before continuing" diff --git a/spec/dummy/spec/simplecov_helper.rb b/spec/dummy/spec/simplecov_helper.rb index c73cbf247..44854b40a 100644 --- a/spec/dummy/spec/simplecov_helper.rb +++ b/spec/dummy/spec/simplecov_helper.rb @@ -2,7 +2,7 @@ # Starts SimpleCov for code coverage. -if ENV["COVERAGE"] +if ENV["COVERAGE"] == "true" require "simplecov" # Using a command name along with the test_env_number prevents results from diff --git a/spec/react_on_rails/simplecov_helper.rb b/spec/react_on_rails/simplecov_helper.rb index 46a3c19ec..1f6b2b40a 100644 --- a/spec/react_on_rails/simplecov_helper.rb +++ b/spec/react_on_rails/simplecov_helper.rb @@ -2,7 +2,7 @@ # Starts SimpleCov for code coverage. -if ENV["COVERAGE"] +if ENV["COVERAGE"] == "true" require "simplecov" # Using a command name prevents results from getting clobbered by other test # suites