From 51d1bbbd7052ebf902d73ecf8006faa86aa2a51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Tue, 24 Jan 2012 11:50:27 +0100
Subject: [PATCH] app.user returns false instead of undefined if logged out,
fix #2723
---
public/javascripts/app/app.js | 2 +-
spec/javascripts/app/app_spec.js | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/public/javascripts/app/app.js b/public/javascripts/app/app.js
index 5fcfc60172..9797a6869f 100644
--- a/public/javascripts/app/app.js
+++ b/public/javascripts/app/app.js
@@ -6,7 +6,7 @@ var app = {
user: function(user) {
if(user) { return this._user = user }
- return this._user
+ return this._user || false
},
initialize: function() {
diff --git a/spec/javascripts/app/app_spec.js b/spec/javascripts/app/app_spec.js
index 49c9b64a79..0be9ee9753 100644
--- a/spec/javascripts/app/app_spec.js
+++ b/spec/javascripts/app/app_spec.js
@@ -7,5 +7,11 @@ describe("app", function() {
expect(app.user()).toEqual({name: "alice"});
});
+
+ it("returns false if the current_user isn't set", function() {
+ app._user = undefined;
+
+ expect(app.user()).toEqual(false);
+ });
});
});
--
GitLab