Revert Ember 2.10+ for a short while

This commit is contained in:
Robin Ward
2016-12-15 16:43:38 -05:00
parent f01f95d62d
commit 21682fd60b
101 changed files with 1273 additions and 1866 deletions

View File

@ -5,10 +5,8 @@ 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, resetExtraClasses } from 'discourse/lib/plugin-connectors';
import { clearCache as clearOutletCache } from 'discourse/helpers/plugin-outlet';
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);
@ -46,7 +44,6 @@ 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) {
@ -80,11 +77,9 @@ 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();