Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/services/fastboot.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,8 @@ export default Ember.Service.extend({

isFastBoot: computed(function() {
return typeof FastBoot !== 'undefined';
})
}),
deferRendering(promise) {
this._fastbootInfo.deferRendering(promise);
}
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"broccoli-merge-trees": "^1.1.1",
"broccoli-plugin": "^1.2.1",
"broccoli-stew": "^1.2.0",
"ember-fastboot-server": "^0.6.0",
"ember-fastboot-server": "0.6.2",
"express": "^4.8.5",
"lodash.clonedeep": "^4.3.1",
"lodash.defaults": "^4.0.1",
Expand Down
38 changes: 38 additions & 0 deletions tests/acceptance/async-content-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
var chai = require('chai');
var expect = chai.expect;
var RSVP = require('rsvp');
var AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
var request = require('request');
var get = RSVP.denodeify(request);

describe('async content via deferred content', function() {
this.timeout(300000);

var app;

before(function() {

app = new AddonTestApp();

return app.create('async-content')
.then(function() {
return app.startServer({
command: 'fastboot',
additionalArguments: ['--serve-assets']
});
});
});

after(function() {
return app.stopServer();
});

it('waits for async content when using `fastboot.deferRendering`', function() {
return get({
url: 'http://localhost:49741/'
})
.then(function(response) {
expect(response.body).to.contain('Async content: foo');
});
});
});
20 changes: 20 additions & 0 deletions tests/fixtures/async-content/app/components/async-content.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import Ember from 'ember';

export default Ember.Component.extend({
fastboot: Ember.inject.service(),

init() {
this._super(...arguments);

let deferred = Ember.RSVP.defer();

Ember.run.later(() => {
if (!this.get('isDestroyed')) {
Copy link
Contributor

@stefanpenner stefanpenner Apr 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this callback should not bet let run if the component has been destroyed. Instead on destroy, we should actually cancel this timer, and more importantly we should also cleanup/resolve the promise.

Otherwise we cause the component (and everything it references) to be retained until the timer finally fires, although we know it has been destroyed earlier.

this.set('setLater', 'foo');
}
deferred.resolve()
}, 100);

this.get('fastboot').deferRendering(deferred.promise);
}
});
1 change: 1 addition & 0 deletions tests/fixtures/async-content/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{async-content}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Async content: {{setLater}}