ES6 module migrations

test/javascripts/admin/controllers/admin-email-index-test.js.es6

@@ -1,5 +0,0 @@
-moduleFor("controller:admin-email-index");
-
-test("mixes in Discourse.Presence", function() {
-  ok(Discourse.Presence.detect(this.subject()));
-});

test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6

@@ -1,5 +0,0 @@
-moduleFor("controller:admin-email-preview-digest");
-
-test("mixes in Discourse.Presence", function() {
-  ok(Discourse.Presence.detect(this.subject()));
-});

test/javascripts/controllers/discourse-test.js.es6

@@ -1,7 +1,8 @@
 import DiscourseController from 'discourse/controllers/controller';
+import Presence from 'discourse/mixins/presence';
 
 module("DiscourseController");
 
 test("includes mixins", function() {
-  ok(Discourse.Presence.detect(DiscourseController.create()), "Discourse.Presence");
+  ok(Presence.detect(DiscourseController.create()), "has Presence");
 });

test/javascripts/helpers/create-pretender.js.es6

@@ -131,7 +131,7 @@ export default function() {
       return response(200, { basic_topic: {id: request.params.id,
                                            title: data.title,
                                            fancy_title: data.title,
-                                           slug: request.params.slug } })
+                                           slug: request.params.slug } });
     });
 
     this.post('/posts', function(request) {

test/javascripts/mixins/presence-test.js.es6

@@ -1,6 +1,8 @@
-module("Discourse.Presence");
+import Presence from 'discourse/mixins/presence';
 
-var testObj = Em.Object.createWithMixins(Discourse.Presence, {
+module("mixin:presence");
+
+var testObj = Em.Object.createWithMixins(Presence, {
   emptyString: "",
   nonEmptyString: "Evil Trout",
   emptyArray: [],

test/javascripts/models/model-test.js.es6

@@ -1,14 +1,17 @@
+import Presence from 'discourse/mixins/presence';
+import Model from 'discourse/models/model';
+
 module("Discourse.Model");
 
-test("mixes in Discourse.Presence", function() {
-  ok(Discourse.Presence.detect(Discourse.Model.create()));
+test("mixes in Presence", function() {
+  ok(Presence.detect(Model.create()));
 });
 
 test("extractByKey: converts a list of hashes into a hash of instances of specified class, indexed by their ids", function() {
   var firstObject = {id: "id_1", foo: "foo_1"};
   var secondObject = {id: "id_2", foo: "foo_2"};
 
-  var actual = Discourse.Model.extractByKey([firstObject, secondObject], Ember.Object);
+  var actual = Model.extractByKey([firstObject, secondObject], Ember.Object);
   var expected = {
     id_1: Ember.Object.create(firstObject),
     id_2: Ember.Object.create(secondObject)
@@ -18,6 +21,6 @@ test("extractByKey: converts a list of hashes into a hash of instances of specif
 });
 
 test("extractByKey: returns an empty hash if there isn't anything to convert", function() {
-  deepEqual(Discourse.Model.extractByKey(), {}, "when called without parameters");
-  deepEqual(Discourse.Model.extractByKey([]), {}, "when called with an empty array");
+  deepEqual(Model.extractByKey(), {}, "when called without parameters");
+  deepEqual(Model.extractByKey([]), {}, "when called with an empty array");
 });

test/javascripts/views/container-view-test.js.es6

@@ -1,3 +1,5 @@
+import Presence from 'discourse/mixins/presence';
+
 var SomeViewClass = Ember.View.extend();
 
 function containerHasOnlyOneChild(containerView, klass) {
@@ -17,9 +19,9 @@ function childHasProperty(containerView, name) {
 
 moduleFor("view:container");
 
-test("mixes in Discourse.Presence", function() {
+test("mixes in Presence", function() {
   var containerView = this.subject();
-  ok(Discourse.Presence.detect(containerView));
+  ok(Presence.detect(containerView));
 });
 
 test("attachViewWithArgs: creates a view of a given class with given properties and appends it to the container", function() {

test/javascripts/views/view-test.js.es6

@@ -1,3 +1,5 @@
+import Presence from 'discourse/mixins/presence';
+
 var oldHelpers;
 
 module("Discourse.View", {
@@ -10,8 +12,8 @@ module("Discourse.View", {
   }
 });
 
-test("mixes in Discourse.Presence", function() {
-  ok(Discourse.Presence.detect(Discourse.View.create()));
+test("mixes in Presence", function() {
+  ok(Presence.detect(Discourse.View.create()));
 });
 
 test("registerHelper: enables embedding a child view in a parent view via dedicated, named helper instead of generic 'view' helper", function() {