Skip to content

Commit 2ade9ef

Browse files
authored
Merge pull request #352 from jasonmit/isFastBoot-writeable
Make isFastBoot writeable (again)
2 parents 85d5281 + b189f32 commit 2ade9ef

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

app/services/fastboot.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ const Shoebox = Ember.Object.extend({
6363
const FastBootService = Ember.Service.extend({
6464
cookies: deprecatingAlias('request.cookies', { id: 'fastboot.cookies-to-request', until: '0.9.9' }),
6565
headers: deprecatingAlias('request.headers', { id: 'fastboot.headers-to-request', until: '0.9.9' }),
66+
isFastBoot: typeof FastBoot !== 'undefined',
6667

6768
init() {
6869
this._super(...arguments);
@@ -95,10 +96,4 @@ const FastBootService = Ember.Service.extend({
9596
}
9697
});
9798

98-
Object.defineProperty(FastBootService.proto(), 'isFastBoot', {
99-
writable: false,
100-
enumerable: true,
101-
value: typeof FastBoot !== 'undefined'
102-
});
103-
10499
export default FastBootService;

tests/unit/services/fastboot-test.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@ import { moduleFor, test } from 'ember-qunit';
33
moduleFor('service:fastboot', 'Unit | Service | fastboot in the browser', {});
44

55
test('isFastBoot', function(assert) {
6-
assert.expect(3);
7-
86
let service = this.subject();
97
assert.equal(service.isFastBoot, false, `it should be false`);
108
assert.equal(service.get('isFastBoot'), false, `it should be false`);
11-
12-
try {
13-
service.isFastBoot = true;
14-
} catch(e) {
15-
assert.ok(true, 'throws since isFastBoot is not writable');
16-
}
179
});
1810

1911
test('request', function(assert) {

0 commit comments

Comments
 (0)