Replace CurrentUserMixin with an injected currentUser

This is a lot simpler and removes the need for stubbing singletons
in unit tests.

app/assets/javascripts/discourse/controllers/controller.js.es6

@@ -1 +1 @@
-export default Ember.Controller.extend(Discourse.Presence, Discourse.HasCurrentUser);
+export default Ember.Controller.extend(Discourse.Presence);

app/assets/javascripts/discourse/controllers/notifications.js.es6

@@ -1,4 +1,4 @@
-export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
+export default Ember.ArrayController.extend({
   needs: ['header'],
   loadingNotifications: Em.computed.alias('controllers.header.loadingNotifications')
 });

app/assets/javascripts/discourse/controllers/object.js.es6

@@ -1 +1 @@
-export default Ember.ObjectController.extend(Discourse.Presence, Discourse.HasCurrentUser);
+export default Ember.ObjectController.extend(Discourse.Presence);

app/assets/javascripts/discourse/controllers/site-map-category.js.es6

@@ -1,4 +1,4 @@
-export default Ember.ObjectController.extend(Discourse.HasCurrentUser, {
+export default Ember.ObjectController.extend({
   needs: ['site-map'],
 
   unreadTotal: function() {

app/assets/javascripts/discourse/controllers/site-map.js.es6

@@ -1,4 +1,4 @@
-export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
+export default Ember.ArrayController.extend({
   needs: ['application'],
 
   showBadgesLink: function(){return Discourse.SiteSettings.enable_badges;}.property(),

app/assets/javascripts/discourse/controllers/user-dropdown.js.es6

@@ -1,8 +1,8 @@
-export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
+export default Ember.ArrayController.extend({
   showAdminLinks: Em.computed.alias("currentUser.staff"),
 
   actions: {
-    logout: function() {
+    logout() {
       Discourse.logout();
       return false;
     }

app/assets/javascripts/discourse/controllers/user-topics-list.js.es6

@@ -1,7 +1,7 @@
 import ObjectController from 'discourse/controllers/object';
 
 // Lists of topics on a user's page.
-export default ObjectController.extend(Discourse.HasCurrentUser, {
+export default ObjectController.extend({
   needs: ["application", "user"],
   hideCategory: false,
   showParticipants: false,

app/assets/javascripts/discourse/initializers/inject-objects.js.es6

@@ -42,9 +42,9 @@ export default {
     app.inject('view', 'session', 'session:main');
     app.inject('model', 'session', 'session:main');
 
-    // Inject currentUser. Components only for now to prevent any breakage
     app.register('current-user:main', Discourse.User.current(), { instantiate: false });
     app.inject('component', 'currentUser', 'current-user:main');
+    app.inject('controller', 'currentUser', 'current-user:main');
 
     app.register('store:main', Store);
     app.inject('route', 'store', 'store:main');

app/assets/javascripts/discourse/mixins/has_current_user.js

@@ -1,12 +0,0 @@
-/**
-  This mixin provides a `currentUser` property that can be used to retrieve information
-  about the currently logged in user. It is mostly useful to controllers so it can be
-  exposted to templates.
-**/
-Discourse.HasCurrentUser = Em.Mixin.create({
-
-  currentUser: function() {
-    return Discourse.User.current();
-  }.property().volatile()
-
-});

app/assets/javascripts/discourse/routes/build-category-route.js.es6

@@ -28,8 +28,7 @@ export default function(filter, params) {
         category: model,
         filterMode: filterMode,
         noSubcategories: params && params.no_subcategories,
-        canEditCategory: model.get('can_edit'),
+        canEditCategory: model.get('can_edit')
-        canChangeCategoryNotificationLevel: Discourse.User.current()
       });
     },
 

app/assets/javascripts/discourse/templates/navigation/category.hbs

@@ -10,7 +10,7 @@
   {{custom-html "extraNavItem"}}
 </ul>
 
-{{#if canChangeCategoryNotificationLevel}}
+{{#if currentUser}}
   {{category-notifications-button category=category}}
 {{/if}}
 

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

@@ -4,5 +4,4 @@ module("DiscourseController");
 
 test("includes mixins", function() {
   ok(Discourse.Presence.detect(DiscourseController.create()), "Discourse.Presence");
-  ok(Discourse.HasCurrentUser.detect(DiscourseController.create()), "Discourse.HasCurrentUser");
 });

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

@@ -3,26 +3,23 @@ moduleFor("controller:header", "controller:header", {
 });
 
 test("showNotifications action", function() {
-  var resolveRequestWith;
+  let resolveRequestWith;
-  var request = new Ember.RSVP.Promise(function(resolve) {
+  const request = new Ember.RSVP.Promise(function(resolve) {
     resolveRequestWith = resolve;
   });
 
-  var controller = this.subject();
+  const currentUser = Discourse.User.create({ unread_notifications: 1});
-  var viewSpy = {
+  const controller = this.subject({ currentUser: currentUser });
-    showDropdownBySelector: sinon.spy()
+  const viewSpy = { showDropdownBySelector: sinon.spy() };
-  };
+
   sandbox.stub(Discourse, "ajax").withArgs("/notifications").returns(request);
-  sandbox.stub(Discourse.User, "current").returns(Discourse.User.create({
-    unread_notifications: 1
-  }));
 
   Ember.run(function() {
     controller.send("showNotifications", viewSpy);
   });
 
   equal(controller.get("notifications"), null, "notifications are null before data has finished loading");
-  equal(Discourse.User.current().get("unread_notifications"), 1, "current user's unread notifications count is not zeroed before data has finished loading");
+  equal(currentUser.get("unread_notifications"), 1, "current user's unread notifications count is not zeroed before data has finished loading");
   ok(viewSpy.showDropdownBySelector.calledWith("#user-notifications"), "dropdown with loading glyph is shown before data has finished loading");
 
   Ember.run(function() {
@@ -31,6 +28,6 @@ test("showNotifications action", function() {
 
   // Can't use deepEquals because controller.get("notifications") is an ArrayProxy, not an Array
   ok(controller.get("notifications").indexOf("notification") !== -1, "notification is in the controller");
-  equal(Discourse.User.current().get("unread_notifications"), 0, "current user's unread notifications count is zeroed after data has finished loading");
+  equal(currentUser.get("unread_notifications"), 0, "current user's unread notifications count is zeroed after data has finished loading");
   ok(viewSpy.showDropdownBySelector.calledWith("#user-notifications"), "dropdown with notifications is shown after data has finished loading");
 });

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

@@ -1,7 +0,0 @@
-moduleFor('controller:notifications', 'controller:notifications', {
-  needs: ['controller:header']
-});
-
-test("mixes in HasCurrentUser", function() {
-  ok(Discourse.HasCurrentUser.detect(this.subject()));
-});

test/javascripts/controllers/site-map-test.js.es6

@@ -13,26 +13,21 @@ moduleFor("controller:site-map", "controller:site-map", {
 });
 
 test("showAdminLinks", function() {
-  var currentUserStub = Ember.Object.create();
+  const currentUser = Ember.Object.create({ staff: true });
-  sandbox.stub(Discourse.User, "current").returns(currentUserStub);
+  const controller = this.subject({ currentUser });
-
-  currentUserStub.set("staff", true);
-  var controller = this.subject();
   equal(controller.get("showAdminLinks"), true, "is true when current user is a staff member");
 
-  currentUserStub.set("staff", false);
+  currentUser.set("staff", false);
   equal(controller.get("showAdminLinks"), false, "is false when current user is not a staff member");
 });
 
 test("flaggedPostsCount", function() {
-  var currentUserStub = Ember.Object.create();
+  const currentUser = Ember.Object.create({ site_flagged_posts_count: 5 });
-  sandbox.stub(Discourse.User, "current").returns(currentUserStub);
+  const controller = this.subject({ currentUser });
 
-  currentUserStub.set("site_flagged_posts_count", 5);
-  var controller = this.subject();
   equal(controller.get("flaggedPostsCount"), 5, "returns current user's flagged posts count");
 
-  currentUserStub.set("site_flagged_posts_count", 0);
+  currentUser.set("site_flagged_posts_count", 0);
   equal(controller.get("flaggedPostsCount"), 0, "is bound (reacts to change of current user's flagged posts count)");
 });
 

test/javascripts/controllers/user-dropdown-test.js.es6

@@ -1,23 +1,19 @@
 moduleFor("controller:user-dropdown");
 
 test("logout action logs out the current user", function () {
-  var logout_mock = sinon.mock(Discourse, "logout");
+  const logoutMock = sinon.mock(Discourse, "logout");
-  logout_mock.expects("logout").once();
+  logoutMock.expects("logout").once();
 
-  var controller = this.subject();
+  this.subject().send('logout');
-  controller.send("logout");
 
-  logout_mock.verify();
+  logoutMock.verify();
 });
 
 test("showAdminLinks", function() {
-  var currentUserStub = Ember.Object.create();
+  const currentUser = Ember.Object.create({ staff: true });
-  sandbox.stub(Discourse.User, "current").returns(currentUserStub);
+  const controller = this.subject({ currentUser });
-
-  currentUserStub.set("staff", true);
-  var controller = this.subject();
   equal(controller.get("showAdminLinks"), true, "is true when current user is a staff member");
 
-  currentUserStub.set("staff", false);
+  currentUser.set("staff", false);
   equal(controller.get("showAdminLinks"), false, "is false when current user is not a staff member");
 });

test/javascripts/mixins/has-current-user-test.js.es6

@@ -1,12 +0,0 @@
-module("Discourse.HasCurrentUser");
-
-test("adds `currentUser` property to an object and ensures it is not cached", function() {
-  sandbox.stub(Discourse.User, "current");
-  var testObj = Ember.Object.createWithMixins(Discourse.HasCurrentUser, {});
-
-  Discourse.User.current.returns("first user");
-  equal(testObj.get("currentUser"), "first user", "on the first call property returns initial user");
-
-  Discourse.User.current.returns("second user");
-  equal(testObj.get("currentUser"), "second user", "if the user changes, on the second call property returns changed user");
-});