ember-test-helpers - npm Package Compare versions

Comparing version 0.5.31 to 0.5.32

lib/ember-test-helpers/abstract-test-module.js

		import { Klass } from 'klassy';
		import { _setupAJAXHooks, _teardownAJAXHooks } from './wait';
		import { setContext, unsetContext } from './test-context';
		import { getContext, setContext, unsetContext } from './test-context';

		import Ember from 'ember';

		const assign = Ember.assign \|\| Ember.merge;
		// calling this `merge` here because we cannot
		// actually assume it is like `Object.assign`
		// with > 2 args
		const merge = Ember.assign \|\| Ember.merge;

		export default Klass.extend({
		init(name, options) {
		this.context = undefined;
		this.name = name;
		@@ -103,10 +107,24 @@ this.callbacks = options \|\| {};
		setupContext(options) {
		var config = assign({
		let context = this.getContext();

		merge(context, {
		dispatcher: null,
		inject: {}
		}, options);
		});
		merge(context, options);

		setContext(config);
		setContext(context);
		this.context = context;
		},

		setContext(context) {
		this.context = context;
		},

		getContext() {
		if (this.context) { return this.context; }

		return this.context = getContext() \|\| {};
		},

		setupAJAXListeners() {
		@@ -113,0 +131,0 @@ _setupAJAXHooks();

lib/ember-test-helpers/test-module-for-integration.js

		import Ember from 'ember';
		import { getContext } from './test-context';
		import AbstractTestModule from './abstract-test-module';
		@@ -102,3 +101,3 @@ import { getResolver } from './test-resolver';

		var context = this.context = getContext();
		var context = this.context;

		@@ -105,0 +104,0 @@ if (Ember.setOwner) {

lib/ember-test-helpers/test-module.js

		import Ember from 'ember';
		import { getContext } from './test-context';
		import AbstractTestModule from './abstract-test-module';
		@@ -122,9 +121,7 @@ import { getResolver } from './test-resolver';
		return target.register.apply(target, arguments);
		},
		}
		});

		var context = this.context = getContext();

		if (Ember.setOwner) {
		Ember.setOwner(context, this.container.owner);
		Ember.setOwner(this.context, this.container.owner);
		}
		@@ -131,0 +128,0 @@

package.json

		{
		"name": "ember-test-helpers",
		"version": "0.5.31",
		"version": "0.5.32",
		"description": "Helpers for testing Ember.js applications",
		@@ -5,0 +5,0 @@ "main": "lib/ember-test-helpers.js",

New alerts