clean

Author: papandreou

lib/createTopLevelExpect.js

@@ -1350,14 +1350,14 @@ expectPrototype.addAdditionalPromiseMethods = function (promise, subject) {
           );
         } else {
           if (wrappedExpect !== expect) {
-            return wrappedExpect.shifty(
+            return wrappedExpect._shifty(
               shiftedSubject,
               wrappedExpect.args,
               [
                 methodName.replace(/[A-Z]/g, ($0) => ` ${$0.toLowerCase()}`),
                 ...args,
               ],
-              true // legacy mode (FIXME)
+              true // setArgsOutput
             );
           } else {
             return expect._executeExpect(
@@ -1917,10 +1917,9 @@ expectPrototype._callInNestedContext = function (callback) {
   }
 };
 
-expectPrototype.shifty = function (subject, args, rest, legacyMode) {
+expectPrototype._shifty = function (subject, args, rest, setArgsOutput) {
   const nextArgumentType = this.findTypeOf(rest[0]);
-  if (legacyMode) {
-    // Legacy
+  if (setArgsOutput) {
     this.argsOutput = (output) => {
       args.forEach((arg, index) => {
         if (index > 0) {
@@ -1985,7 +1984,8 @@ expectPrototype.shift = function (subject, assertionIndex) {
   if (assertionIndex !== -1) {
     const args = this.args.slice(0, assertionIndex);
     const rest = this.args.slice(assertionIndex);
-    return this.shifty(subject, args, rest, arguments.length > 1);
+    const setArgsOutput = arguments.length > 1;
+    return this._shifty(subject, args, rest, setArgsOutput);
   } else {
     // No assertion to delegate to. Provide the new subject as the fulfillment value:
     return subject;