IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

ES6ify some of the remaining files

Browse Source
This commit is contained in:
Robin Ward
2015-08-07 15:08:27 -04:00
parent 378087727f
commit b7e6eaa961
96 changed files with 684 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/javascripts/test_helper.js
View File

@@ -79,6 +79,7 @@ var origDebounce = Ember.run.debounce,
createPretendServer = require('helpers/create-pretender', null, null, false).default,
fixtures = require('fixtures/site_fixtures', null, null, false).default,
flushMap = require('discourse/models/store', null, null, false).flushMap,
ScrollingDOMMethods = require('discourse/mixins/scrolling', null, null, false).ScrollingDOMMethods,
server;
function dup(obj) {
@@ -92,6 +93,7 @@ QUnit.testStart(function(ctx) {
Discourse.SiteSettings = dup(Discourse.SiteSettingsOriginal);
Discourse.BaseUri = "/";
Discourse.BaseUrl = "localhost";
Discourse.Session.resetCurrent();
Discourse.User.resetCurrent();
Discourse.Site.resetCurrent(Discourse.Site.create(dup(fixtures['site.json'].site)));
@@ -103,8 +105,8 @@ QUnit.testStart(function(ctx) {
PreloadStore.reset();
window.sandbox = sinon.sandbox.create();
window.sandbox.stub(Discourse.ScrollingDOMMethods, "bindOnScroll");
window.sandbox.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll");
window.sandbox.stub(ScrollingDOMMethods, "bindOnScroll");
window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll");
// Don't debounce in test unless we're testing debouncing
if (ctx.module.indexOf('debounce') === -1) {