Upgrade ember-qunit

This commit is contained in:
Robin Ward
2016-11-08 14:29:50 -05:00
parent 151597bf0f
commit 6a1c05a268
9 changed files with 341 additions and 75 deletions

View File

@ -1,4 +1,9 @@
import { mapRoutes } from 'discourse/mapping-router';
moduleFor("controller:avatar-selector", "controller:avatar-selector", {
setup() {
this.registry.register('router:main', mapRoutes());
},
needs: ['controller:modal']
});

View File

@ -1,4 +1,9 @@
import { mapRoutes } from 'discourse/mapping-router';
moduleFor("controller:create-account", "controller:create-account", {
setup() {
this.registry.register('router:main', mapRoutes());
},
needs: ['controller:modal', 'controller:login']
});

View File

@ -1,5 +1,6 @@
import createStore from 'helpers/create-store';
import AdminUser from 'admin/models/admin-user';
import { mapRoutes } from 'discourse/mapping-router';
var buildPost = function(args) {
return Discourse.Post.create(_.merge({
@ -17,6 +18,9 @@ var buildAdminUser = function(args) {
};
moduleFor("controller:flag", "controller:flag", {
setup() {
this.registry.register('router:main', mapRoutes());
},
needs: ['controller:modal']
});
@ -97,4 +101,4 @@ test("canSendWarning notify_user selected", function(){
sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
var flagController = this.subject({ model: buildPost() });
canSendWarning(flagController, 'notify_user', true, 'true if current user is staff, selected is notify_user');
});
});

View File

@ -1,8 +1,12 @@
import { blank, present } from 'helpers/qunit-helpers';
import { mapRoutes } from 'discourse/mapping-router';
moduleFor('controller:topic', 'controller:topic', {
needs: ['controller:modal', 'controller:composer', 'controller:quote-button',
'controller:application']
'controller:application'],
setup() {
this.registry.register('router:main', mapRoutes());
},
});
import Topic from 'discourse/models/topic';