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

REFACTOR: Remove many Discourse.Category.list() calls

Browse Source
This commit is contained in:
Robin Ward
2017-11-01 15:08:18 -04:00
parent 91438849d2
commit 0a69f2bc77
16 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/javascripts/helpers/qunit-helpers.js.es6
View File

@ -1,7 +1,6 @@
/* global QUnit, fixtures */
/* global QUnit, resetSite */
import sessionFixtures from 'fixtures/session-fixtures';
import siteFixtures from 'fixtures/site-fixtures';
import HeaderComponent from 'discourse/components/site-header';
import { forceMobile, resetMobile } from 'discourse/lib/mobile';
import { resetPluginApi } from 'discourse/lib/plugin-api';
@ -60,7 +59,6 @@ export function acceptance(name, options) {
HeaderComponent.reopen({examineDockHeader: function() { }});
resetExtraClasses();
const siteJson = siteFixtures['site.json'].site;
if (options.beforeEach) {
options.beforeEach.call(this);
}
@ -78,7 +76,7 @@ export function acceptance(name, options) {
}
if (options.site) {
Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, siteJson, options.site)));
resetSite(Discourse.SiteSettings, options.site);
}
clearOutletCache();
@ -93,8 +91,7 @@ export function acceptance(name, options) {
}
flushMap();
Discourse.User.resetCurrent();
Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site)));
resetSite(Discourse.SiteSettings);
resetExtraClasses();
clearOutletCache();
clearHTMLCache();

7
test/javascripts/test_helper.js
View File

@ -81,10 +81,11 @@ function dup(obj) {
return jQuery.extend(true, {}, obj);
}
function resetSite() {
function resetSite(siteSettings, extras) {
var createStore = require('helpers/create-store').default;
var siteAttrs = dup(fixtures['site.json'].site);
var siteAttrs = $.extend({}, fixtures['site.json'].site, extras || {});
siteAttrs.store = createStore();
siteAttrs.siteSettings = siteSettings;
Discourse.Site.resetCurrent(Discourse.Site.create(siteAttrs));
}
@ -105,7 +106,7 @@ QUnit.testStart(function(ctx) {
Discourse.BaseUrl = "localhost";
Discourse.Session.resetCurrent();
Discourse.User.resetCurrent();
resetSite();
resetSite(Discourse.SiteSettings);
_DiscourseURL.redirectedTo = null;
_DiscourseURL.redirectTo = function(url) {