github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 04:00:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Show user fields when the user is signing up

Browse Source
This commit is contained in:
Robin Ward
2014-09-26 14:48:34 -04:00
parent 872d8fce58
commit edb34c178a
42 changed files with 476 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/javascripts/helpers/qunit_helpers.js → test/javascripts/helpers/qunit-helpers.js.es6
View File

@ -1,9 +1,13 @@
/* global asyncTest */
/* exported integration, testController, controllerFor, asyncTestDiscourse, fixture */
function integration(name, options) {
import siteFixtures from 'fixtures/site_fixtures';
export function integration(name, options) {
module("Integration: " + name, {
setup: function() {
Ember.run(Discourse, Discourse.advanceReadiness);
var siteJson = siteFixtures['site.json'].site;
if (options) {
if (options.setup) {
options.setup.call(this);
@ -16,7 +20,12 @@ function integration(name, options) {
if (options.settings) {
Discourse.SiteSettings = jQuery.extend(true, Discourse.SiteSettings, options.settings);
}
if (options.site) {
Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, siteJson, options.site)));
}
}
Discourse.reset();
},
@ -30,13 +39,13 @@ function integration(name, options) {
});
}
function controllerFor(controller, model) {
export function controllerFor(controller, model) {
controller = Discourse.__container__.lookup('controller:' + controller);
if (model) { controller.set('model', model ); }
return controller;
}
function asyncTestDiscourse(text, func) {
export function asyncTestDiscourse(text, func) {
asyncTest(text, function () {
var self = this;
Ember.run(function () {
@ -45,7 +54,7 @@ function asyncTestDiscourse(text, func) {
});
}
function fixture(selector) {
export function fixture(selector) {
if (selector) {
return $("#qunit-fixture").find(selector);
}