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

Revert "REVERT: Ember 2.10 -- it's not building properly"

Browse Source 
This reverts commit 600541c6238a5b371992ad363859d5d9c75ad004.
This commit is contained in:
Robin Ward
2016-12-12 16:24:36 -05:00
parent ffc97f2298
commit 28699e66d8
88 changed files with 1723 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,10 @@ 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';
import { clearCache as clearOutletCache } from 'discourse/helpers/plugin-outlet';
import { clearCache as clearOutletCache, resetExtraClasses } from 'discourse/lib/plugin-connectors';
import { clearHTMLCache } from 'discourse/helpers/custom-html';
import { flushMap } from 'discourse/models/store';
function currentUser() {
return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
@ -44,6 +46,7 @@ function acceptance(name, options) {
// For now don't do scrolling stuff in Test Mode
HeaderComponent.reopen({examineDockHeader: Ember.K});
resetExtraClasses();
const siteJson = siteFixtures['site.json'].site;
if (options) {
if (options.setup) {
@ -77,9 +80,11 @@ function acceptance(name, options) {
if (options && options.teardown) {
options.teardown.call(this);
}
flushMap();
Discourse.User.resetCurrent();
Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site)));
resetExtraClasses();
clearOutletCache();
clearHTMLCache();
resetPluginApi();