From f70cefb9835428edf05ab9b213643a5da76fd87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Wed, 30 Dec 2015 11:45:11 +0100
Subject: [PATCH] Link user menu button to the users profile

---
 app/assets/templates/header_tpl.jst.hbs                       | 2 +-
 spec/javascripts/app/views/header_view_spec.js                | 2 +-
 spec/javascripts/app/views/notification_dropdown_view_spec.js | 1 +
 spec/javascripts/app/views/notifications_view_spec.js         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 9884aaae9..0855fa835 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -85,7 +85,7 @@
 
           <ul class="nav navbar-nav navbar-right">
             <li class="dropdown" id="user_menu">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+              <a href="{{urlTo "person" current_user.guid}}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
                 <span class="user-avatar pull-left">
                   {{{personImage current_user "small"}}}
                 </span>
diff --git a/spec/javascripts/app/views/header_view_spec.js b/spec/javascripts/app/views/header_view_spec.js
index cd789c2aa..0850935e8 100644
--- a/spec/javascripts/app/views/header_view_spec.js
+++ b/spec/javascripts/app/views/header_view_spec.js
@@ -1,6 +1,6 @@
 describe("app.views.Header", function() {
   beforeEach(function() {
-    this.userAttrs = {name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}};
+    this.userAttrs = {name: "alice", avatar: {small: "http://avatar.com/photo.jpg"}, guid: "foo" };
 
     loginAs(this.userAttrs);
 
diff --git a/spec/javascripts/app/views/notification_dropdown_view_spec.js b/spec/javascripts/app/views/notification_dropdown_view_spec.js
index eb7a1e7e9..ec9641030 100644
--- a/spec/javascripts/app/views/notification_dropdown_view_spec.js
+++ b/spec/javascripts/app/views/notification_dropdown_view_spec.js
@@ -4,6 +4,7 @@ describe("app.views.NotificationDropdown", function() {
     gon.appConfig = {settings: {podname: "MyPod"}};
     this.header = new app.views.Header();
     $("header").prepend(this.header.el);
+    loginAs({guid: "foo"});
     this.header.render();
     this.view = new app.views.NotificationDropdown({el: "#notification-dropdown"});
   });
diff --git a/spec/javascripts/app/views/notifications_view_spec.js b/spec/javascripts/app/views/notifications_view_spec.js
index 3c5df5003..4d04a2078 100644
--- a/spec/javascripts/app/views/notifications_view_spec.js
+++ b/spec/javascripts/app/views/notifications_view_spec.js
@@ -79,7 +79,7 @@ describe("app.views.Notifications", function(){
 
     context("with a header", function() {
       beforeEach(function() {
-        loginAs({name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}, notifications_count : 2});
+        loginAs({name: "alice", avatar: {small: "http://avatar.com/photo.jpg"}, notifications_count: 2, guid: "foo"});
         gon.appConfig = {settings: {podname: "MyPod"}};
         this.header = new app.views.Header();
         $("header").prepend(this.header.el);