feat: remove 'no data' message when there are no rows.

pact-foundation · Mar 4, 2019 · b0246a2 · b0246a2
1 parent 8f2d5a9
commit b0246a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/pact_broker/client/can_i_deploy.rb b/lib/pact_broker/client/can_i_deploy.rb
@@ -52,21 +52,26 @@ def create_result(matrix)
       def success_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says yes \o/ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.green(matrix.reason)}"
+          message = 'Computer says yes \o/ ' + message + "\n\n" + Term::ANSIColor.green(matrix.reason)
         end
         message
       end
 
       def failure_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says no ¯\_(ツ)_/¯ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.red(matrix.reason)}"
+          message = 'Computer says no ¯\_(ツ)_/¯ ' + message + "\n\n" + Term::ANSIColor.red(matrix.reason)
         end
         message
       end
 
       def format_matrix(matrix)
-        Matrix::Formatter.call(matrix, format)
+        formatted_matrix = Matrix::Formatter.call(matrix, format)
+        if format != 'json' && formatted_matrix.size > 0
+          "\n\n" + formatted_matrix
+        else
+          formatted_matrix
+        end
       end
 
       def format

diff --git a/lib/pact_broker/client/matrix/text_formatter.rb b/lib/pact_broker/client/matrix/text_formatter.rb
@@ -16,7 +16,9 @@ class TextFormatter
         ]
 
         def self.call(matrix)
-          data = matrix[:matrix].collect do | line |
+          matrix_rows = matrix[:matrix]
+          return "" if matrix_rows.size == 0
+          data = matrix_rows.collect do | line |
             Line.new(
               lookup(line, :consumer, :name),
               lookup(line, :consumer, :version, :number),