Download as
Browse Code »

Commit 1632de4ad16a9c7fe9b05773d1c4d71413b3d6d7

Authored by Daniela Feitosa
1 parent d252e70e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixed suggestions of usernames 

Also included unit test to account_helper
(ActionItem3009)
Showing 2 changed files with 24 additions and 3 deletions   Show diff stats
app/helpers/account_helper.rb
  Diff comments   View file @1632de4
@@ -13,14 +13,14 @@ module AccountHelper @@ -13,14 +13,14 @@ module AccountHelper
13 end 13 end
14 end 14 end
15 15
16 - def suggestion_based_on_username(requested_username) 16 + def suggestion_based_on_username(requested_username='')
17 return "" if requested_username.empty? 17 return "" if requested_username.empty?
18 usernames = [] 18 usernames = []
19 3.times do 19 3.times do
20 begin 20 begin
21 valid_name = requested_username + rand(1000).to_s 21 valid_name = requested_username + rand(1000).to_s
22 - end while (usernames.include?(valid_name) && Person.is_available?(valid_name, environment))  
23 - usernames += [valid_name] 22 + end while (usernames.include?(valid_name) || !Person.is_available?(valid_name, environment))
  23 + usernames << valid_name
24 end 24 end
25 usernames 25 usernames
26 end 26 end
test/unit/account_helper_test.rb 0 → 100644
  Diff comments   View file @1632de4
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class AccountHelperTest < ActiveSupport::TestCase
  4 +
  5 + include AccountHelper
  6 + include ActionView::Helpers::TagHelper
  7 +
  8 + should 'not suggest usernames if username is empty' do
  9 + assert_equal '', suggestion_based_on_username
  10 + end
  11 +
  12 + should 'suggest valid usernames' do
  13 + ze = create_user('ze').person
  14 + stubs(:environment).returns(ze.environment)
  15 + suggestions = suggestion_based_on_username('ze')
  16 + suggestions.each do |suggestion|
  17 + assert_equal true, Person.is_available?(suggestion, ze.environment)
  18 + end
  19 + end
  20 +
  21 +end