From e04d3d8a625b83ce778df39a420d4c840766f2da Mon Sep 17 00:00:00 2001
From: Gregg Van Hove <gregg@slackersoft.net>
Date: Fri, 17 May 2019 17:07:47 -0700
Subject: [PATCH] Fix bad merge for spyOnProperty error message

---
 lib/jasmine-core/jasmine.js | 2 +-
 src/core/SpyRegistry.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js
index 44e564ba..f461a3bf 100644
--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -6491,7 +6491,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
         if (this.respy) {
           return descriptor[accessType];
         } else {
-          throw new Error(getErrorMsg(propertyName + ' has already been spied upon'));
+          throw new Error(getErrorMsg(propertyName + '#' + accessType + ' has already been spied upon'));
         }
       }
 
diff --git a/src/core/SpyRegistry.js b/src/core/SpyRegistry.js
index 3f6d79e8..3f4e3bc9 100644
--- a/src/core/SpyRegistry.js
+++ b/src/core/SpyRegistry.js
@@ -98,7 +98,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
         if (this.respy) {
           return descriptor[accessType];
         } else {
-          throw new Error(getErrorMsg(propertyName + ' has already been spied upon'));
+          throw new Error(getErrorMsg(propertyName + '#' + accessType + ' has already been spied upon'));
         }
       }