REFACTOR: PreloadStore to ES6

test/javascripts/helpers/current_user.js

@@ -1 +0,0 @@
-PreloadStore.store("currentUser", {"id":42,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","name":"Evil Trout","unread_notifications":0,"unread_private_messages":0,"admin":false,"notification_channel_position":null,"site_flagged_posts_count":0,"moderator":false,"staff":false,"reply_count":0,"topic_count":0,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":false,"trust_level":0,"can_edit":true}); 

test/javascripts/helpers/custom-html-test.js.es6

@@ -1,4 +1,6 @@
 import { blank } from 'helpers/qunit-helpers';
+import PreloadStore from 'preload-store';
+
 module("helper:custom-html");
 
 import { getCustomHTML, setCustomHTML } from 'discourse/helpers/custom-html';
@@ -11,5 +13,4 @@ test("customHTML", function() {
 
   PreloadStore.store('customHTML', {cookie: 'monster'});
   equal(getCustomHTML('cookie'), 'monster', 'it returns HTML fragments from the PreloadStore');
-
 });

test/javascripts/lib/preload-store-test.js.es6

@@ -1,7 +1,8 @@
 import { blank } from 'helpers/qunit-helpers';
+import PreloadStore from 'preload-store';
 
-module("Discourse.PreloadStore", {
-  setup: function() {
+module("preload-store", {
+  setup() {
     PreloadStore.store('bane', 'evil');
   }
 });

test/javascripts/test_helper.js

@@ -1,7 +1,6 @@
 /*global document, sinon, QUnit, Logster */
 
 //= require env
-//= require preload_store
 //= require probes
 //= require jquery.debug
 //= require jquery.ui.widget
@@ -14,6 +13,7 @@
 //= require route-recognizer
 //= require pretender
 //= require loader
+//= require preload-store
 
 //= require locales/i18n
 //= require locales/en
@@ -41,6 +41,7 @@
 //
 //= require jquery.magnific-popup-min.js
 
+window.TestPreloadStore = require('preload-store').default;
 window.inTestEnv = true;
 
 // Stop the message bus so we don't get ajax calls
@@ -75,6 +76,13 @@ function dup(obj) {
   return jQuery.extend(true, {}, obj);
 }
 
+function resetSite() {
+  var createStore = require('helpers/create-store').default;
+  var siteAttrs = dup(fixtures['site.json'].site);
+  siteAttrs.store = createStore();
+  Discourse.Site.resetCurrent(Discourse.Site.create(siteAttrs));
+}
+
 QUnit.testStart(function(ctx) {
   server = createPretendServer();
 
@@ -84,14 +92,15 @@ QUnit.testStart(function(ctx) {
   Discourse.BaseUrl = "localhost";
   Discourse.Session.resetCurrent();
   Discourse.User.resetCurrent();
-  Discourse.Site.resetCurrent(Discourse.Site.create(dup(fixtures['site.json'].site)));
+  resetSite();
 
   _DiscourseURL.redirectedTo = null;
   _DiscourseURL.redirectTo = function(url) {
     _DiscourseURL.redirectedTo = url;
   };
 
-  PreloadStore.reset();
+  var ps = require('preload-store').default;
+  ps.reset();
 
   window.sandbox = sinon.sandbox.create();
   window.sandbox.stub(ScrollingDOMMethods, "screenNotFull");
@@ -132,4 +141,5 @@ Object.keys(requirejs.entries).forEach(function(entry) {
   }
 });
 require('mdtest/mdtest', null, null, true);
+resetSite();