Merge branch 'master' into v2

Author: maxfierke

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 1.1.5
+  - Avoid auto-tracking rerender assertion / infinite rerender during cancelation
+    in certain contexts in Ember 3.15+ (#341, Fixes #340)
+
+### 1.1.4
+  - Avoid auto-tracking rerender assertion thrown in certain contexts in Ember 3.15+
+  - Fix passing tasks into `action` helper directly on Ember 2.8 (yes, 2.8)
+
 ### 1.1.3
   - Fix issue where `rawTimeout`, `waitForEvent`, and `waitForQueue` helper timers
     were not properly canceled or cleaned up in some cases, such as when used with

addon/-private/task-instance.js

@@ -72,7 +72,7 @@ export class TaskInstance extends BaseTaskInstance {
 
   getName() {
     if (!this.name) {
-      this.name = this.get("task._propertyName") || "<unknown>";
+      this.name = (this.task && this.task._propertyName) || "<unknown>";
     }
     return this.name;
   }

addon/-private/utils.js

@@ -23,6 +23,7 @@ let locations = [
   '@ember/-internals/glimmer',
   'ember-glimmer',
   'ember-glimmer/helpers/action',
+  'ember-htmlbars/keywords/closure-action',
   'ember-routing-htmlbars/keywords/closure-action',
   'ember-routing/keywords/closure-action'
 ];

config/ember-try.js

@@ -19,7 +19,8 @@ module.exports = async function() {
         npm: {
           devDependencies: {
             '@ember/jquery': null,
-            'ember-source': null
+            'ember-source': null,
+            '@embroider/macros': null
           }
         }
       },
@@ -33,12 +34,20 @@ module.exports = async function() {
             'ember': 'lts-2-8'
           }
         },
+        npm: {
+          devDependencies: {
+            '@ember/jquery': null,
+            'ember-source': null,
+            '@embroider/macros': null
+          }
+        }
       },
       {
         name: 'ember-lts-2.12',
         npm: {
           devDependencies: {
-            'ember-source': '~2.12.0'
+            'ember-source': '~2.12.0',
+            '@embroider/macros': null
           }
         }
       },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-concurrency",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Improved concurrency/async primitives for Ember.js",
   "scripts": {
     "build": "ember build",
@@ -17,6 +17,7 @@
     "@babel/core": "^7.6.4",
     "@ember/jquery": "^0.6.1",
     "@ember/optional-features": "^0.7.0",
+    "@embroider/macros": "^0.10.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-clean-css": "^1.1.0",
@@ -44,6 +45,7 @@
     "ember-export-application-global": "^2.0.0",
     "ember-fn-helper-polyfill": "^1.0.2",
     "ember-load-initializers": "^2.0.0",
+    "ember-modifier": "^1.0.2",
     "ember-notify": "^5.3.0",
     "ember-qunit": "^4.4.1",
     "ember-qunit-assert-helpers": "^0.2.2",

tests/integration/no-render-breaking-test.js

@@ -0,0 +1,75 @@
+import Component from '@ember/component';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { modifier } from 'ember-modifier';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+import { task, timeout } from 'ember-concurrency';
+import { gte } from 'ember-compatibility-helpers';
+
+module('Integration | no render breaking', function(hooks) {
+  setupRenderingTest(hooks);
+
+  if (gte('3.15.0')) {
+    test('Issue #337 | internal task state updates do not trigger re-render assertions w/ auto-tracking', async function(assert) {
+      assert.expect(1);
+
+      this.owner.register(
+        'modifier:autofocus',
+        modifier(function autofocus(element) {
+          const childElement = element.querySelector('input');
+          childElement.focus();
+        })
+      );
+
+      this.owner.register(
+        'component:e-c-test',
+        Component.extend({
+          layout: hbs`<input>`,
+
+          focusIn() {
+            this.exampleTask.perform();
+          },
+
+          exampleTask: task(function*() {
+            yield timeout(100);
+          }),
+        })
+      );
+
+      await render(hbs`
+        {{#macroIf (macroDependencySatisfies "ember-source" ">= 3.15.0")}}
+          <ECTest {{autofocus}} />
+        {{/macroIf}}
+      `);
+      assert.ok(true, "Renders");
+    });
+
+    test('Issue #340 | internal task state updates in cancellation do not trigger re-render assertions w/ auto-tracking', async function(assert) {
+      assert.expect(1);
+
+      this.owner.register(
+        'component:e-c-test',
+        Component.extend({
+          layout: hbs`<div>{{this.value}}</div>`,
+
+          get value() {
+            this._super(...arguments);
+
+            this.exampleTask.perform();
+            this.exampleTask.perform();
+
+            return "value";
+          },
+
+          exampleTask: task(function*() {
+            yield timeout(100);
+          }).restartable()
+        })
+      );
+
+      await render(hbs`<ECTest />`);
+      assert.ok(true, "Renders");
+    });
+  }
+});