Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usage of context in moduleForComponent. #157

Closed
wants to merge 4 commits into from
Closed

Remove usage of context in moduleForComponent. #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b75af6
Remove usage of `context` in `moduleForComponent`.
rwjblue Jun 4, 2016
33c7a4e
Update ember-try configuration.
rwjblue Jun 4, 2016
965b154
Fix issues against 2.6 beta branch.
rwjblue Jun 5, 2016
fb639ba
Fix for Ember 1.x.
rwjblue Jun 5, 2016
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
126 changes: 106 additions & 20 deletions config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,40 +64,126 @@ module.exports = {
}
},
{
name: 'ember-release',
name: 'ember-2.3',
dependencies: {
"ember": "components/ember#release"
"ember": "~2.3.0"
},
devDependencies: {
"ember-data": "~2.2.0"
"ember-data": "~2.3.0"
}
},
{
name: 'ember-2.4',
bower: {
dependencies: {
"ember": "~2.4.0"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "~2.4.0"
}
},
resolutions: {
"ember": "release"
npm: {
devDependencies: {
"ember-data": "~2.4"
}
}
},
{
name: 'ember-beta',
dependencies: {
"ember": "components/ember#beta"
name: 'ember-2.5',
bower: {
dependencies: {
"ember": "~2.5.0"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "~2.5.0"
}
},
devDependencies: {
"ember-data": "~2.2.0"
npm: {
devDependencies: {
"ember-data": "~2.5"
}
}
},
{
name: 'ember-2.6',
bower: {
dependencies: {
"ember": "~2.6.0-beta.1"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "~2.6.0-beta.1"
}
},
resolutions: {
"ember": "beta"
npm: {
devDependencies: {
"ember-data": "^2.5.0"
}
}
},
{
name: 'ember-canary',
allowedToFail: true,
dependencies: {
"ember": "components/ember#canary"
name: 'ember-release',
bower: {
dependencies: {
"ember": "components/ember#release"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "release"
}
},
devDependencies: {
"ember-data": "~2.2.0"
npm: {
devDependencies: {
"ember-data": "^2.5.0"
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
"ember": "components/ember#beta"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "beta"
}
},
resolutions: {
"ember": "canary"
npm: {
devDependencies: {
"ember-data": "^2.5.0"
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
"ember": "components/ember#canary"
},
devDependencies: {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "canary"
}
},
npm: {
devDependencies: {
"ember-data": "^2.5.0"
}
}
},
{
Expand Down
69 changes: 48 additions & 21 deletions lib/ember-test-helpers/test-module-for-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ import Ember from 'ember';
import { getResolver } from './test-resolver';
import hasEmberVersion from './has-ember-version';

const BASE_COMPONENT_KEYS = (Object.keys || Ember.keys)(Ember.Component.create());

let ACTION_KEY;
if (hasEmberVersion(2,0)) {
ACTION_KEY = 'actions';
} else {
ACTION_KEY = '_actions';
}

export default TestModule.extend({
isComponentTestModule: true,

Expand Down Expand Up @@ -126,17 +135,20 @@ export default TestModule.extend({
var module = this;
var context = this.context;

this.actionHooks = {};
var actions = this.actionHooks = {};
var setContext = this._setBuffer = { };
setContext[ACTION_KEY] = {};

context.dispatcher = this.container.lookup('event_dispatcher:main') || Ember.EventDispatcher.create();
context.dispatcher.setup({}, '#ember-testing');
context.actions = module.actionHooks;

(this.registry || this.container).register('component:-test-holder', Ember.Component.extend());

context.render = function(template) {
// in case `this.render` is called twice, make sure to teardown the first invocation
module.teardownComponent();
if (module.component) {
context.clearRender();
}

if (!template) {
throw new Error("in a component integration test you must pass a template to `render()`");
Expand All @@ -147,12 +159,9 @@ export default TestModule.extend({
if (typeof template === 'string') {
template = Ember.Handlebars.compile(template);
}
module.component = module.container.lookupFactory('component:-test-holder').create({
layout: template
});

module.component.set('context' ,context);
module.component.set('controller', context);
var Component = module.container.lookupFactory('component:-test-holder').extend(setContext);
setContext = module._setBuffer = module.component = Component.create({ layout: template });

Ember.run(function() {
module.component.appendTo('#ember-testing');
Expand All @@ -165,7 +174,7 @@ export default TestModule.extend({

context.set = function(key, value) {
var ret = Ember.run(function() {
return Ember.set(context, key, value);
return Ember.set(setContext, key, value);
});

if (hasEmberVersion(2,0)) {
Expand All @@ -175,7 +184,7 @@ export default TestModule.extend({

context.setProperties = function(hash) {
var ret = Ember.run(function() {
return Ember.setProperties(context, hash);
return Ember.setProperties(setContext, hash);
});

if (hasEmberVersion(2,0)) {
Expand All @@ -184,31 +193,49 @@ export default TestModule.extend({
};

context.get = function(key) {
return Ember.get(context, key);
return Ember.get(setContext, key);
};

context.getProperties = function() {
var args = Array.prototype.slice.call(arguments);
return Ember.getProperties(context, args);
return Ember.getProperties(setContext, args);
};

context.on = function(actionName, handler) {
module.actionHooks[actionName] = handler;
};

context.send = function(actionName) {
var hook = module.actionHooks[actionName];
if (!hook) {
throw new Error("integration testing template received unexpected action " + actionName);
}
hook.apply(module, Array.prototype.slice.call(arguments, 1));
setContext[ACTION_KEY][actionName] = handler;
};

context.clearRender = function() {
setContext = this._setBuffer = { };
setContext[ACTION_KEY] = actions;

for (var key in module.component) {
if (BASE_COMPONENT_KEYS.indexOf(key) === -1) {
setContext[key] = Ember.get(module.component, key);
}
}
module.teardownComponent();
};
},

setupInject: function() {
var module = this;

if (Ember.inject) {
var keys = (Object.keys || Ember.keys)(Ember.inject);

keys.forEach(function(typeName) {
module.context.inject[typeName] = function(name, opts) {
var alias = (opts && opts.as) || name;
var instance = module.container.lookup(typeName + ':' + name);

Ember.set(module.context, alias, instance);
Ember.set(module._setBuffer, alias, instance);
};
});
}
},

setupContext: function() {
this._super.call(this);

Expand Down
10 changes: 9 additions & 1 deletion lib/ember-test-helpers/test-module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,20 @@ export default AbstractTestModule.extend({
Ember.setOwner(context, this.container.owner);
}

this.setupInject();
},

setupInject: function() {
var module = this;
var context = this.context;

if (Ember.inject) {
var keys = (Object.keys || Ember.keys)(Ember.inject);

keys.forEach(function(typeName) {
context.inject[typeName] = function(name, opts) {
var alias = (opts && opts.as) || name;
Ember.set(context, alias, context.container.lookup(typeName + ':' + name));
Ember.set(context, alias, module.container.lookup(typeName + ':' + name));
};
});
}
Expand Down
22 changes: 19 additions & 3 deletions lib/ember-test-helpers/wait.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,23 @@ export function _setupAJAXHooks() {
jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests);
}

var _internalCheckWaiters;
if (Ember.__loader.registry['ember-testing/test/waiters']) {
_internalCheckWaiters = Ember.__loader.require('ember-testing/test/waiters').checkWaiters;
}

function checkWaiters() {
if (_internalCheckWaiters) {
return _internalCheckWaiters();
} else if (Ember.Test.waiters) {
if (Ember.Test.waiters.any(([context, callback]) => !callback.call(context) )) {
return true;
}
}

return false;
}

export default function wait(_options) {
var options = _options || {};
var waitForTimers = options.hasOwnProperty('waitForTimers') ? options.waitForTimers : true;
Expand All @@ -43,12 +60,11 @@ export default function wait(_options) {
return;
}

if (waitForWaiters && Ember.Test.waiters && Ember.Test.waiters.any(([context, callback]) => {
return !callback.call(context);
})) {
if (waitForWaiters && checkWaiters()) {
return;
}


// Stop polling
self.clearInterval(watcher);

Expand Down
Loading