- Fixed Assertions#diff from recalculating if set to nil

[git-p4: depot-paths = "//src/minitest/dev/": change = 12113]
minitest · Jun 9, 2019 · 9116a29 · 9116a29
1 parent 4103a10
commit 9116a29
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/minitest/assertions.rb b/lib/minitest/assertions.rb
@@ -27,6 +27,8 @@ def UNDEFINED.inspect # :nodoc:
     # figure out what diff to use.
 
     def self.diff
+      return @diff if defined? @diff
+
       @diff = if (RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ &&
                   system("diff.exe", __FILE__, __FILE__)) then
                 "diff.exe -u"
@@ -38,9 +40,7 @@ def self.diff
                 "diff -u"
               else
                 nil
-              end unless defined? @diff
-
-      @diff
+              end
     end
 
     ##