Merge pull request #19233 from emberjs/fix-multiple-deprecations

Ensure multiple deprecations (warnings, etc) are tracked correctly

Author: rwjblue

packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js

@@ -718,6 +718,13 @@ moduleFor(
       });
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          backtrackingMessageFor('undefined', undefined, {
+            renderTree: ['\\(result of a `<\\(unknown\\).*?>` helper\\)'],
+          })
+        );
+
         this.render('{{hello-world}}');
       }, expectedMessage);
     }

packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js

@@ -239,15 +239,15 @@ moduleFor(
             names: emberA(['Alex', 'Ben']),
           }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "outer-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
 
       this.assertStableRerender();
 
       this.assertText('0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]');
 
       expectDeprecation(() => {
         runTask(() => this.context.names.pushObject('Sophie'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "outer-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
 
       this.assertText(
         '0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]2: [outer: Sophie] [inner: Sophie]'
@@ -294,7 +294,7 @@ moduleFor(
         {{/with}}`,
           { age: 0 }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "person2-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "person(2|3|4)-partial" partial to a component/);
 
       this.assertStableRerender();
 
@@ -332,7 +332,7 @@ moduleFor(
             },
           }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "odd" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(odd|even)" partial to a component/);
 
       this.assertStableRerender();
 

packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js

@@ -418,6 +418,13 @@ moduleFor(
       });
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          backtrackingMessageFor('undefined', undefined, {
+            renderTree: ['\\(result of a `.*` helper\\)'],
+          })
+        );
+
         this.render('{{hello-world this.model}}', { model: {} });
       }, expectedMessage);
     }

packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js

@@ -1,6 +1,12 @@
 export function backtrackingMessageFor(key, obj, { renderTree } = {}) {
   // Start off with standard backtracking assertion
-  let regex = [`You attempted to update \`${key}\` on \`${obj}\``];
+  let regex;
+
+  if (obj) {
+    regex = [`You attempted to update \`${key}\` on \`${obj}\``];
+  } else {
+    regex = [`You attempted to update \`${key}\``];
+  }
 
   if (renderTree) {
     // match the renderTree if it was included

packages/@ember/-internals/metal/tests/accessors/get_test.js

@@ -314,6 +314,11 @@ moduleFor(
       let obj = new EmberObject();
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          /You attempted to update `undefined`, but it had already been used previously in the same computation/
+        );
+
         track(() => {
           get(obj, 'bar');
         });

packages/ember/tests/routing/decoupled_basic_test.js

@@ -1418,7 +1418,7 @@ moduleFor(
           expectDeprecation(() => {
             assert.equal(appController.get('currentPath'), expectedPath);
             assert.equal(appController.get('currentRouteName'), expectedRouteName);
-          }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
+          }, /Accessing `(currentPath|currentRouteName)` on `controller:application` is deprecated, use the `(currentPath|currentRouteName)` property on `service:router` instead\./);
         }
 
         transitionAndCheck(null, 'index', 'index');

packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts

@@ -101,6 +101,7 @@ export default class MethodCallTracker {
 
     let actual: Actual | undefined;
     let match: Actual | undefined = undefined;
+    let matched: Set<number> = new Set();
 
     for (o = 0; o < expectedMessages.length; o++) {
       const expectedMessage = expectedMessages[o];
@@ -135,7 +136,8 @@ export default class MethodCallTracker {
 
         if (matchesMessage && matchesOptionList) {
           match = actual;
-          break;
+          matched.add(i);
+          continue;
         }
       }
 
@@ -171,5 +173,11 @@ export default class MethodCallTracker {
         );
       }
     }
+
+    for (i = 0; i < actuals.length; i++) {
+      if (!matched.has(i) && actuals[i][1] !== true) {
+        assert.ok(false, `Unexpected Ember.${methodName} call: ${actuals[i][0]}`);
+      }
+    }
   }
 }