Skip to content
Merged
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
4 changes: 2 additions & 2 deletions tests/integration/modifiers/will-destroy-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module('Integration | Modifier | will-destroy', function (hooks) {
this.set('show', true);

await render(
hbs`{{#if show}}<div data-foo="some-thing" {{will-destroy this.someMethod}}></div>{{/if}}`
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod}}></div>{{/if}}`
);

// trigger destroy
Expand All @@ -37,7 +37,7 @@ module('Integration | Modifier | will-destroy', function (hooks) {
this.set('show', true);

await render(
hbs`{{#if show}}<div data-foo="some-thing" {{will-destroy this.someMethod "some-positional-value" some="hash-value"}}></div>{{/if}}`
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod "some-positional-value" some="hash-value"}}></div>{{/if}}`
);

// trigger destroy
Expand Down
3 changes: 1 addition & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import * as QUnit from 'qunit';
import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';
import { assign } from '@ember/polyfills';

setApplication(Application.create(config.APP));

Expand All @@ -15,7 +14,7 @@ start();
QUnit.assert.namedArgsEqual = function (actual, expected, message) {
// this is needed because older versions of Ember pass an `EmptyObject`
// based object and QUnit fails due to the prototypes not matching
let sanitizedActual = assign({}, actual);
let sanitizedActual = Object.assign({}, actual);

this.deepEqual(sanitizedActual, expected, message);
};