From 056d5892fa5d9860f5ad15a38fb553d53a983dcc Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Mon, 4 Jul 2022 15:34:38 -0600
Subject: [PATCH] Indicate class double/mock in stubbed name

---
 src/spectator/mocks/double.cr       |  8 ++++++++
 src/spectator/mocks/mock.cr         | 17 +++++++++++++++++
 src/spectator/mocks/stubbed_type.cr |  8 --------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/spectator/mocks/double.cr b/src/spectator/mocks/double.cr
index 7d41f3a..022d782 100644
--- a/src/spectator/mocks/double.cr
+++ b/src/spectator/mocks/double.cr
@@ -130,6 +130,14 @@ module Spectator
       {% end %}
     end
 
+    private def self._spectator_stubbed_name : String
+      {% if anno = @type.annotation(StubbedName) %}
+        "#<Class Double " + \{{(anno[0] || :Anonymous.id).stringify}} + "\">"
+      {% else %}
+        "#<Class Double Anonymous>"
+      {% end %}
+    end
+
     private def _spectator_stub_fallback(call : MethodCall, &)
       Log.trace { "Fallback for #{call} - call original" }
       yield
diff --git a/src/spectator/mocks/mock.cr b/src/spectator/mocks/mock.cr
index 847031f..02160a1 100644
--- a/src/spectator/mocks/mock.cr
+++ b/src/spectator/mocks/mock.cr
@@ -63,6 +63,14 @@ module Spectator
             \{% end %}
           end
 
+          private def self._spectator_stubbed_name : String
+            \{% if anno = @type.annotation(::Spectator::StubbedName) %}
+              "#<Class Mock {{mocked_type.id}} \"" + \{{(anno[0] || :Anonymous.id).stringify}} + "\">"
+            \{% else %}
+              "#<Class Mock {{mocked_type.id}}>"
+            \{% end %}
+          end
+
           macro finished
             stub_type {{mocked_type.id}}
 
@@ -149,6 +157,15 @@ module Spectator
             \{% end %}
           end
 
+          # Returns the mock's name formatted for user output.
+          private def self._spectator_stubbed_name : String
+            \{% if anno = @type.annotation(::Spectator::StubbedName) %}
+              "#<Class Mock {{type_name.id}} \"" + \{{(anno[0] || :Anonymous.id).stringify}} + "\">"
+            \{% else %}
+              "#<Class Mock {{type_name.id}}>"
+            \{% end %}
+          end
+
           macro finished
             stub_type {{type_name.id}}
 
diff --git a/src/spectator/mocks/stubbed_type.cr b/src/spectator/mocks/stubbed_type.cr
index 23a4342..40b2fc1 100644
--- a/src/spectator/mocks/stubbed_type.cr
+++ b/src/spectator/mocks/stubbed_type.cr
@@ -54,13 +54,5 @@ module Spectator
     def _spectator_abstract_stub_fallback(call : MethodCall, type)
       _spectator_abstract_stub_fallback(call)
     end
-
-    def _spectator_stubbed_name : String
-      {% if anno = @type.annotation(StubbedName) %}
-        "#<Stubbed " + {{(anno[0] || :Anonymous.id).stringify}} + ">"
-      {% else %}
-        "#<Stubbed " + {{@type.name.stringify}} + ">"
-      {% end %}
-    end
   end
 end