fix: use symbol representation on clear method

Author: notanengineercom

ava.config.js

@@ -1,6 +1,6 @@
 
 module.exports = {
-	files: ['spec/**/*.ts'],
+	files: ['spec/**/*.spec.ts'],
 	typescript: {
 		compile: false,
 		rewritePaths: {
@@ -10,4 +10,4 @@ module.exports = {
   cache: false,
   failFast: true,
   failWithoutAssertions: true
-}
+}

spec/ClearSubstitute.spec.ts …ec/regression/clearReceivedCalls.spec.tsspec/ClearSubstitute.spec.ts renamed to spec/regression/clearReceivedCalls.spec.ts spec/ClearSubstitute.spec.ts renamed to spec/regression/clearReceivedCalls.spec.ts

@@ -1,7 +1,7 @@
 import test from 'ava'
 
-import { Substitute, SubstituteOf } from '../src'
-import { SubstituteNode, instance } from '../src/internals/SubstituteNode'
+import { Substitute, SubstituteOf, clearReceivedCalls } from '../../src'
+import { SubstituteNode, instance } from '../../src/internals/SubstituteNode'
 
 interface Calculator {
   add(a: number, b: number): number
@@ -14,11 +14,11 @@ type InstanceReturningSubstitute<T> = SubstituteOf<T> & {
   [instance]: SubstituteNode
 }
 
-test.skip('clears received calls on a substitute', t => {
+test('clears received calls on a substitute', t => {
   const calculator = Substitute.for<Calculator>() as InstanceReturningSubstitute<Calculator>
   calculator.add(1, 1)
   calculator.add(1, 1).returns(2)
-  calculator.clearReceivedCalls();
+  calculator[clearReceivedCalls]();
 
   t.is(calculator[instance].recorder.records.size, 2)
   t.is(calculator[instance].recorder.indexedRecords.size, 2)

src/api/types/SubstituteMethods.ts

@@ -26,6 +26,4 @@ export type ObjectSubstituteMethods<T> =
   (T extends { mimick: any } ? 
     { [mimick](instance: T): void } :
     { mimick(instance: T): void }) &
-  (T extends { clearReceivedCalls: any } ? 
-    { [clearReceivedCalls](): void } :
-    { clearReceivedCalls(): void })
+  { [clearReceivedCalls](): void }

src/api/types/index.ts

@@ -5,5 +5,5 @@ export type ObjectSubstitute<T> =
     ObjectSubstituteMethods<T> & 
     ObjectSubstituteTransformation<T>
 
-export { received } from './SubstituteMethods'
+export { received, didNotReceive, clearReceivedCalls, mimick } from './SubstituteMethods'
 export { returns, throws, resolves, rejects, mimicks } from './SubstitutionLevel'

src/internals/SubstituteNode.ts

@@ -6,7 +6,7 @@ import { SubstituteException } from './SubstituteException'
 import { is, stringify, transform } from './utilities'
 
 import { constants } from './Constants'
-import type { SubstituteContext, PropertyType, SubstituteNodeModel, AccessorType, SubstituteMethod, SubstitutionMethod } from './Types'
+import type { SubstituteContext, PropertyType, SubstituteNodeModel, AccessorType, SubstituteMethod, SubstitutionMethod, AssertionMethod } from './Types'
 import { constants as sharedConstants } from '../shared/Constants'
 
 
@@ -48,10 +48,12 @@ export class SubstituteNode extends SubstituteNodeBase implements ObjectSubstitu
 
           const newNode = SubstituteNode.createChild(property, target)
           if (target.isAssertion) newNode.executeAssertion()
-          if (target.hasDepthOfAtLeast(1) && !target.hasContext && is.method.assertion(target.property)) {
+          const unresolvedAssertionFollowedBySubstitution = !target.hasContext && is.method.assertion(target.property) && !is.method.substitution(newNode.property)
+          if (target.hasDepthOfAtLeast(1) && unresolvedAssertionFollowedBySubstitution) {
             target.assignContext(target.property)
-            target[target.property](...Array.isArray(target.recordedArguments.value) ? target.recordedArguments.value : [undefined])
+            target[target.context as AssertionMethod](...Array.isArray(target.recordedArguments.value) ? target.recordedArguments.value : [undefined])
             if (target.isAssertion) newNode.executeAssertion()
+            // if (target.isConfiguration) newNode.executeConfiguration()
           }
           if (target.isRoot() && is.method.contextValue(property) && (is.method.assertion(property) || is.method.configuration(property))) {
             newNode.assignContext(property)
@@ -238,7 +240,8 @@ export class SubstituteNode extends SubstituteNodeBase implements ObjectSubstitu
       return
     }
 
-    const withContext = this.parent.property === sharedConstants.CONTEXT.received.symbol
+    // const withContext = this.parent.property === sharedConstants.CONTEXT.received.symbol
+    const withContext = false
     const siblings = [...this.getAllSiblings().filter(n => (withContext || !n.hasContext) && n.accessorType === this.accessorType)]
     const hasBeenCalled = siblings.length > 0
     const hasSiblingOfSamePropertyType = siblings.some(sibling => sibling.propertyType === this.propertyType)