chore(ember): Make tests less brittle (#6164)

We already had some logic to make test less brittle, but the runloop is a bit unstable, and thus hard to test. So it is easier to just don't test the runloop execution in detail, especially since these are the least interesting spans, and focus on testing the important parts (that are also more stable).

Author: mydea

packages/ember/tests/acceptance/sentry-performance-test.js

@@ -22,20 +22,19 @@ function assertSentryCall(assert, callNumber, options) {
     assert.equal(event.spans.length, options.spanCount);
   }
   if (options.spans) {
-    event.spans = event.spans.map(s => {
-      return `${s.op} | ${s.description}`;
-    });
-
-    // FIXME: For some reason, the last `afterRender` and `destroy` run queue event are not always called.
-    //        This is not a blocker, but should be investigated and fixed, as this is the expected output.
-    const lastSpan = event.spans[event.spans.length - 1];
-    if (lastSpan === 'ui.ember.runloop.afterRender | undefined') {
-      event.spans.push('ui.ember.runloop.destroy | undefined');
-    } else if (lastSpan === 'ui.ember.runloop.render | undefined') {
-      event.spans.push('ui.ember.runloop.afterRender | undefined', 'ui.ember.runloop.destroy | undefined');
-    }
-
-    assert.deepEqual(event.spans, options.spans, `Has correct spans`);
+    // instead of checking the specific order of runloop spans (which is brittle),
+    // we check (below) that _any_ runloop spans are added
+    const spans = event.spans
+      .filter(span => !span.op.startsWith('ui.ember.runloop.'))
+      .map(s => {
+        return `${s.op} | ${s.description}`;
+      });
+
+    assert.true(
+      event.spans.some(span => span.op.startsWith('ui.ember.runloop.')),
+      'it captures runloop spans',
+    );
+    assert.deepEqual(spans, options.spans, `Has correct spans`);
   }
 
   assert.equal(event.transaction, options.transaction);
@@ -53,7 +52,7 @@ module('Acceptance | Sentry Performance', function (hooks) {
   setupSentryTest(hooks);
 
   test('Test transaction', async function (assert) {
-    assert.expect(6);
+    assert.expect(7);
 
     await visit('/tracing');
 
@@ -62,11 +61,6 @@ module('Acceptance | Sentry Performance', function (hooks) {
       spans: [
         'ui.ember.transition | route:undefined -> route:tracing',
         'ui.ember.component.render | component:test-section',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
       ],
       transaction: 'route:tracing',
       tags: {
@@ -77,7 +71,7 @@ module('Acceptance | Sentry Performance', function (hooks) {
   });
 
   test('Test navigating to slow route', async function (assert) {
-    assert.expect(7);
+    assert.expect(8);
 
     await visit('/tracing');
     const button = find('[data-test-button="Transition to slow loading route"]');
@@ -89,45 +83,15 @@ module('Acceptance | Sentry Performance', function (hooks) {
       spans: [
         'ui.ember.transition | route:tracing -> route:slow-loading-route.index',
         'ui.ember.route.before_model | slow-loading-route',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
         'ui.ember.route.model | slow-loading-route',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
         'ui.ember.route.after_model | slow-loading-route',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
         'ui.ember.route.before_model | slow-loading-route.index',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
         'ui.ember.route.model | slow-loading-route.index',
-        'ui.ember.runloop.actions | undefined',
-        'ui.ember.runloop.routerTransitions | undefined',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
         'ui.ember.route.after_model | slow-loading-route.index',
-        'ui.ember.runloop.actions | undefined',
         'ui.ember.route.setup_controller | slow-loading-route',
         'ui.ember.route.setup_controller | slow-loading-route.index',
-        'ui.ember.runloop.routerTransitions | undefined',
         'ui.ember.component.render | component:slow-loading-list',
         'ui.ember.component.render | component:slow-loading-list',
-        'ui.ember.runloop.render | undefined',
-        'ui.ember.runloop.afterRender | undefined',
-        'ui.ember.runloop.destroy | undefined',
       ],
       transaction: 'route:slow-loading-route.index',
       durationCheck: duration => duration > SLOW_TRANSITION_WAIT,