From f03e21f7d50e34e7f7f7e7f570e8604fbd4d27da Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 22 Apr 2014 16:55:34 -0400 Subject: [PATCH] User.full_name should not contain just a space when first_name and last_name are not set. Add a test for that, too. --- services/api/app/models/user.rb | 2 +- services/api/test/unit/user_test.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb index 513e0aec94..81cae987a2 100644 --- a/services/api/app/models/user.rb +++ b/services/api/app/models/user.rb @@ -27,7 +27,7 @@ class User < ArvadosModel ALL_PERMISSIONS = {read: true, write: true, manage: true} def full_name - "#{first_name} #{last_name}" + "#{first_name} #{last_name}".strip end def is_invited diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb index 67d0badf24..fd56a745a8 100644 --- a/services/api/test/unit/user_test.rb +++ b/services/api/test/unit/user_test.rb @@ -87,6 +87,17 @@ class UserTest < ActiveSupport::TestCase assert_equal found_user.identity_url, user.identity_url end + test "full name should not contain spurious whitespace" do + user = User.create ({uuid: 'zzzzz-tpzed-abcdefghijklmno', email: 'foo@example.com' }) + + assert_equal '', user.full_name + + user.first_name = 'John' + user.last_name = 'Smith' + + assert_equal user.first_name + ' ' + user.last_name, user.full_name + end + test "create new user" do Thread.current[:user] = @admin_user # set admin user as the current user -- 2.39.5