community_engine 2.1.0 → 2.3.0

data/app/views/shared/_header.html.haml

@@ -1,4 +1,9 @@
 #hd
+  - if !configatron.community_locale
+    %div
+      %a{:href=>url_for(:subdomain => 'ru', :only_path => false ), :title=>"#{configatron.community_locale} russian translation"}= "rus"
+      %a{:href=>url_for(:subdomain => 'en', :only_path =>false), :title=>"english translation" }= "eng"
+
   %h1
     %a{:href=>home_url, :title=>"#{configatron.community_name}"}= configatron.community_name
   - if logged_in?

data/app/views/topics/show.xml.builder

@@ -10,6 +10,6 @@ xml.rss "version" => "2.0",
     xml.ttl "60"
     xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/open_search.xml"
     xml.description @topic.body
-    render :partial => "sb_posts/post.xml", :collection => @topic.sb_posts, :locals => {:xm => xml}
+    render :partial => "sb_posts/post", :collection => @topic.sb_posts, :locals => {:xm => xml}, :formats => [:xml]
   end
 end

data/app/views/users/edit.html.haml

@@ -52,7 +52,7 @@
       -box do 
         %h3= :tags.l
         #user_tags
-          = text_field_tag 'tag_list', @user.tag_list, {:autocomplete => "off"}
+          = text_field_tag 'tag_list', @user.tag_list.join(", "), {:autocomplete => "off"}
           #tag_list_auto_complete.auto_complete
           -content_for :end_javascript do
             = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }

data/app/views/users/new.html.haml

@@ -3,9 +3,9 @@
     %h3
       =:why_sign_up.l
     %ul.list.checks
-    %li 
+    %li
       = :sign_up_reason_1.l
-    %li 
+    %li
       = :sign_up_reason_2.l
 
   -box :class => 'alt' do
@@ -22,7 +22,7 @@
       %h3=:sign_up.l
       = error_messages_for :user
       = form_for :user, :url => users_path, :html => {:class => 'MainForm'} do |f|
-        %label{"for"=>"user_login"} 
+        %label{"for"=>"user_login"}
           =:username.l
           \:
           %em=:required_your_username_must_not_contain_numerals_spaces_or_special_characters.l

data/app/views/users/statistics.html.haml

@@ -1,5 +1,5 @@
 -box do
-  = form_tag( statistics_user_path(@user), :class => "MainForm") do
+  = form_tag( statistics_user_path(@user), :class => "MainForm", :method => :get) do
     %label= :month.l+":"
     = select_month(@month)
     = select_year(@month, :start_year => 1.years.ago.year, :end_year => 1.years.from_now.year)

data/community_engine.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruno Bornsztein"]
-  s.date = "2011-11-18"
+  s.date = "2013-08-13"
   s.email = "admin@curbly.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<cocaine>, ["0.3.2"])
   s.add_dependency(%q<acts_as_commentable>, ["= 3.0.1"])
   s.add_dependency(%q<recaptcha>, [">= 0"])
-  s.add_dependency(%q<omniauth>, ["= 0.3.2"])
+  s.add_dependency(%q<omniauth>, ["~> 1.1.0"])
   s.add_dependency(%q<prototype-rails>, [">= 0"])
   s.add_dependency(%q<rails_autolink>, [">= 0"])
   s.add_dependency(%q<meta_search>, ["= 1.1.3"])

data/config/locales/de-DE.yml

@@ -579,7 +579,7 @@ de-DE:
   #en: joined: joined
   joined: Mitglied seit
   #en: joined_the_site: joined %{site}
-  joined_the_site: %{site} beigetreten
+  joined_the_site: "%{site} beigetreten"
   #en: just_uploading_one_photo: Just uploading one photo?
   just_uploading_one_photo: Nur ein Foto hochladen?
   #en: keywords: Keywords

data/config/locales/en.yml

@@ -922,9 +922,9 @@ en:
   #en: optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas
   optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas
   #en: yes_status: yes
-  yes: yes
+  yes_status: "yes"
   #en: no_status: no
-  no: no
+  no_status: "no"
   #en: or: or
   or: or
   #en: page: page
@@ -1659,4 +1659,4 @@ en:
   #en; cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
   cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
   #en: back_to_photo_manager: "Back to photo manager"
-  back_to_photo_manager: "Back to photo manager"
+  back_to_photo_manager: "Back to photo manager"

data/config/locales/ru-RU.yml

@@ -499,7 +499,6 @@ ru-RU:
   #en: event_comments: Event Comments
   event_comments: Комментарии события
   #en: event_does_not_allow_rsvp: This event does not allow SVPs.
-  #ut where to be, and when to be thereuOA
   event_does_not_allow_rsvp: Это событие не разрешает приглашения.
   #en: event_was_successfully_created: Event was successfully created.
   event_was_successfully_created: Событие были успешно создано.

data/lib/community_engine/localized_application.rb

@@ -15,8 +15,13 @@ module LocalizedApplication
         logger.debug "[I18n] loading locale: #{configatron.community_locale} from config"
         I18n.locale = configatron.community_locale
     else
+      domain_locale = get_matching_ui_locale( request.subdomains.first )
+      if domain_locale
+        I18n.locale = domain_locale
+      else
         I18n.locale = get_valid_lang_from_accept_header
         logger.debug "[I18n] found a valid http header locale: #{I18n.locale}"
+      end
     end
     
     logger.debug "[I18n] Locale set to #{I18n.locale}"
@@ -58,26 +63,32 @@ module LocalizedApplication
   # Returns the UI locale that best matches with the parameter
   # or nil if not found
   def get_matching_ui_locale(locale)
+    if !locale
+      return nil
+    end
+
     lang = locale[0,2].downcase
     to_try = Array.new()
     if locale[3,5]
       country = locale[3,5].upcase
       logger.debug "[I18n] trying to match locale: #{lang}-#{country} and #{lang}-*"
       to_try << "#{lang}-#{country}".to_sym
-      to_try << "#{lang}-*".to_sym
     else
       logger.debug "[I18n] trying to match #{lang}-*"
-      to_try << "#{lang}-*".to_sym
     end
 
+    to_try << "#{lang}-*".to_sym
+    # Try locales without countries like "en", "es" and so on
+    to_try << "#{lang}".to_sym
+
     # Check with exact matching
     to_try.each do |possible_locale|
-      # if Globalite.ui_locales.values.include?(possible_locale)
-      #   logger.debug "[I18n] Globalite does include #{locale} matching #{possible_locale}"
-        return possible_locale
-      # end
+      matched_locale = I18n.available_locales.grep(/#{possible_locale}/)[0]
+      if matched_locale
+        return matched_locale
+      end
     end
 
     return nil
   end  
-end
+end

data/lib/community_engine/url_upload.rb

@@ -1,5 +1,5 @@
 module UrlUpload
-            
+
   def data_from_url(uri)
     io = (open(URI.parse(uri)) rescue return nil)
     (class << io; self; end;).class_eval do
@@ -7,9 +7,9 @@ module UrlUpload
     end
     io
   end
-  
+
   def validate
     errors.add("filename", "is invalid") if filename? && %w(index.html index.htm).include?(filename.downcase)
   end
-      
-end
+
+end

data/lib/community_engine/version.rb

@@ -1,7 +1,7 @@
 module CommunityEngine
   module Version
      MAJOR = 2
-     MINOR = 1
+     MINOR = 3
      PATCH = 0
      BUILD = nil
 

data/test/functional/topics_controller_test.rb

@@ -15,10 +15,11 @@ class TopicsControllerTest < ActionController::TestCase
   end
 
   def test_should_show_topic_as_rss
+    content_type 'application/rss+xml'
     get :show, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :format => 'rss'
     assert_response :success
   end
-  
+
   def test_should_show_topic_as_xml
     content_type 'application/xml'
     get :show, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :format => 'xml'
@@ -50,7 +51,7 @@ class TopicsControllerTest < ActionController::TestCase
     assert assigns(:topic).sticky?
     assert assigns(:topic).locked?
   end
-    
+
   def test_should_allow_admin_to_sticky_and_lock
     login_as :admin
     post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah2', :sticky => "1", :locked => "1", :body => 'foo' }
@@ -63,9 +64,9 @@ class TopicsControllerTest < ActionController::TestCase
   def test_should_not_create_topic_without_body
     counts = lambda { [Topic.count, SbPost.count] }
     old = counts.call
-    
+
     login_as :aaron
-    
+
     post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah', :sb_posts_attributes => { "0" => { :body => '' } } }
     assert assigns(:topic)
     assert assigns(:post)
@@ -78,14 +79,14 @@ class TopicsControllerTest < ActionController::TestCase
   def test_should_create_topic
     counts = lambda { [Topic.count, SbPost.count, forums(:rails).topics_count, forums(:rails).sb_posts_count,  users(:aaron).sb_posts_count] }
     old = counts.call
-    
+
     login_as :aaron
     post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah', :sb_posts_attributes => { "0" => { :body => 'foo' } } }, :tag_list => 'tag1, tag2'
     assert assigns(:topic)
     assert assigns(:post)
     assert_redirected_to forum_topic_path(forums(:rails), assigns(:topic))
     [forums(:rails), users(:aaron)].each(&:reload)
-  
+
     assert_equal old.collect { |n| n + 1}, counts.call
     assert_equal ['tag1', 'tag2'], Topic.find(assigns(:topic).id).tag_list
   end
@@ -94,7 +95,7 @@ class TopicsControllerTest < ActionController::TestCase
   def test_should_delete_topic
     counts = lambda { [SbPost.count, forums(:rails).topics_count, forums(:rails).sb_posts_count] }
     old = counts.call
-    
+
     login_as :admin
     delete :destroy, :forum_id => forums(:rails).id, :id => topics(:ponies).id
     assert_redirected_to forum_path(forums(:rails))
@@ -162,7 +163,7 @@ class TopicsControllerTest < ActionController::TestCase
     get :edit, :forum_id => 1, :id => 1
     assert_response :success
   end
-  
+
   def test_should_update_own_post
     login_as :sam
     put :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { }, :tag_list => 'tagX, tagY'

data/test/functional/users_controller_test.rb

@@ -6,24 +6,24 @@ class UsersControllerTest < ActionController::TestCase
   def test_should_get_index
     get :index
     assert_response :success
-    
+
     get :index, :tag_name => tags(:misc)
     assert_response :success
-    
+
     get :index, :state_id => states(:minnesota).id
     assert_response :success
-  
+
     get :index, :metro_area_id => metro_areas(:twincities).id
     assert_response :success
   end
-  
+
   def test_should_get_edit_account
     login_as :quentin
     assert_recognizes({:controller => 'users', :action => 'edit_account'}, {:path => '/account/edit', :method => :get})
     get :edit_account
     assert_response :success
-  end  
-  
+  end
+
   def test_should_toggle_moderator
     login_as :admin
     assert !users(:quentin).moderator?
@@ -32,15 +32,15 @@ class UsersControllerTest < ActionController::TestCase
     put :toggle_moderator, :id => users(:quentin)
     assert !users(:quentin).reload.moderator?
   end
-  
+
   def test_should_not_toggle_featured_writer_if_not_admin
     login_as :quentin
     put :toggle_moderator, :id => users(:quentin)
     assert_redirected_to :login_url
     assert !users(:quentin).reload.moderator?
   end
-  
-  
+
+
   def test_should_toggle_featured_writer
     login_as :admin
     assert !users(:quentin).featured_writer?
@@ -49,51 +49,51 @@ class UsersControllerTest < ActionController::TestCase
     put :toggle_featured, :id => users(:quentin)
     assert !users(:quentin).reload.featured_writer?
   end
-  
+
   def test_should_not_toggle_featured_writer_if_not_admin
     login_as :quentin
     put :toggle_featured, :id => users(:quentin)
     assert_redirected_to login_url
     assert !users(:quentin).reload.featured_writer?
   end
-  
+
   def test_should_get_signup_completed
     login_as :quentin
-    
+
     get :signup_completed, :id => users(:quentin)
     assert_response :success
   end
-  
+
   def test_should_get_welcome_photo
-    login_as :quentin  
+    login_as :quentin
     get :welcome_photo, :id => users(:quentin).id
     assert_response :success
   end
-  
+
   def test_should_get_welcome_about
     login_as :quentin
     get :welcome_about, :id => users(:quentin).id
     assert_response :success
   end
-  
+
   def test_should_get_welcome_invite
     login_as :quentin
     get :welcome_invite, :id => users(:quentin).id
     assert_response :success
   end
-  
+
   def test_should_get_new
     get :new
     assert_response :success
   end
-  
+
   def test_should_allow_signup
     assert_difference User, :count do
       create_user
       assert_response :redirect
     end
   end
-  
+
   def test_should_require_login_on_signup
     assert_no_difference User, :count do
       create_user( :user => {:login => nil})
@@ -101,7 +101,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :success
     end
   end
-  
+
   def test_should_require_password_on_signup
     assert_no_difference User, :count do
       create_user( :user => {:password => nil})
@@ -109,7 +109,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :success
     end
   end
-  
+
   def test_should_require_password_confirmation_on_signup
     assert_no_difference User, :count do
       create_user( :user => {:password_confirmation => nil})
@@ -117,7 +117,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :success
     end
   end
-  
+
   def test_should_require_email_on_signup
     assert_no_difference User, :count do
       create_user( :user => {:email => nil})
@@ -125,95 +125,95 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :success
     end
   end
-  
+
   def test_should_render_new_form_when_signing_up_without_required_attributes
     create_user(:user => {:password => nil})
     assert_response :success
   end
-  
+
   def test_should_deactivate_and_logout
     login_as :quentin
     assert users(:quentin).active?
     put :deactivate, :id => users(:quentin).id
-    assert !users(:quentin).reload.active?    
+    assert !users(:quentin).reload.active?
     assert_redirected_to login_path
   end
-    
+
   def test_should_activate_user
     users(:quentin).activated_at = nil
     users(:quentin).activation_code = ':quentin_activation_code'
     users(:quentin).save!
     login_as :quentin
     assert_nil UserSession.find
-    
+
     users(:quentin).activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
     users(:quentin).save!
-    
+
     get :activate, :id => users(:quentin).activation_code
     assert_equal users(:quentin), UserSession.find.record
-  end  
-  
+  end
+
   def test_should_fail_to_activate_user
     users(:quentin).activated_at = nil
     users(:quentin).activation_code = nil
     users(:quentin).save!
     login_as :quentin
     assert_nil UserSession.find
-  
+
     get :activate, :id => 'bad_activation_code'
     assert_nil UserSession.find
-  end  
-  
+  end
+
   def test_should_show_user
     get :show, :id => users(:quentin)
     assert_response :success
   end
-  
+
   def test_should_not_show_private_user
     get :show, :id => users(:privateuser).id
     assert_response :redirect
   end
-  
+
   def test_should_list_users
     get :index
     assert_equal assigns(:users).size, 13
-    
+
     assert_response :success
   end
-  
+
   def test_should_fill_states_on_detroit_search
     #state drop down not being enabled
     get :index, :metro_area_id => metro_areas(:detroit).id
     assert_equal assigns(:states).size, State.count
     assert_response :success
   end
-  
+
   def test_should_empty_states_on_berlin_search
     #state drop down not being enabled
     get :index, :metro_area_id => metro_areas(:berlin).id
     assert_equal assigns(:states).size, 0
     assert_response :success
   end
-  
+
   def test_should_show_edit_form
     login_as :quentin
     get :edit, :id => users(:quentin).id
     assert_response :success
   end
-  
+
   def test_should_not_show_edit_form
     login_as :quentin
     get :edit, :id => users(:aaron)
     assert_redirected_to login_path
   end
-  
+
   def test_should_update_user
     login_as :quentin
     put :update, :id => users(:quentin), :user => {:email => "changed_email@email.com"}
     assert_redirected_to user_path(users(:quentin).reload)
     assert_equal assigns(:user).email, "changed_email@email.com"
   end
-  
+
   def test_should_update_user_tags
     login_as :quentin
     users(:quentin).tag_list = ''
@@ -222,13 +222,13 @@ class UsersControllerTest < ActionController::TestCase
     assert_redirected_to user_path(users(:quentin).reload)
     assert_equal users(:quentin).tag_list, ['tag1', 'tag2']
   end
-  
+
   def test_should_not_update_user
     login_as :quentin
     put :update, :id => users(:aaron), :user => {:login => "changed_login", :email => "changed_email@email.com"}
     assert_redirected_to login_path
   end
-  
+
   def test_should_destroy_user
     login_as :admin
     assert_difference User, :count, -1 do
@@ -236,110 +236,114 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :redirect
     end
   end
-  
+
   def test_should_not_destroy_user
     login_as :aaron
     assert_no_difference User, :count do
       delete :destroy, :id => users(:quentin)
       assert_redirected_to login_path
-    end    
+    end
   end
-  
+
   def test_should_never_destroy_admin
     login_as :admin
     assert_no_difference User, :count do
       delete :destroy, :id => users(:admin)
       assert_response :redirect
-    end    
+    end
   end
-  
+
   def test_should_upload_avatar
     login_as :quentin
     put :update, :id => users(:quentin).id, :user => {:avatar_attributes => {:photo => fixture_file_upload('/files/library.jpg', 'image/jpg')}}
-    assert users(:quentin).reload.avatar.photo_file_name, "library.jpg"
+    assert_equal users(:quentin).reload.avatar.photo_file_name, "library.jpg"
+  end
+
+  def test_should_upload_avatar_from_url
+    login_as :quentin
+    put :update, :id => users(:quentin).id, :user => {:avatar_attributes => {:photo_remote_url => 'http://www.google.com/intl/en_ALL/images/logo.gif'}}
+    assert_equal users(:quentin).reload.avatar.photo_file_name, "library.jpg" #UrlUpload is mocked in test helper
   end
-  
+
   def test_should_not_delete_existing_avatar_if_file_field_is_blank
     login_as :quentin
     put :update, :id => users(:quentin).id, :user => {:avatar_attributes => {:photo => fixture_file_upload('/files/library.jpg', 'image/jpg')}}
     assert users(:quentin).reload.avatar.photo_file_name, "library.jpg"
-  
+
     put :update, :id => users(:quentin).id, :user => {}
-    assert users(:quentin).reload.avatar.photo_file_name, "library.jpg"
+    assert_equal users(:quentin).reload.avatar.photo_file_name, "library.jpg"
   end
-  
+
   def test_should_crop_profile_photo
     login_as :quentin
     avatar = Photo.new(:photo => fixture_file_upload('/files/library.jpg', 'image/jpg'))
     avatar.user = users(:quentin)
     avatar.save!
-  
+
     users(:quentin).avatar = avatar
     users(:quentin).save
-    
+
     put :crop_profile_photo, :id => users(:quentin).id, :x1 => 0, :y1 => 0, :width => 290, :height => 320
-    
+
     assert_redirected_to user_path(users(:quentin))
   end
-  
+
   def test_should_upload_profile_photo
     login_as :quentin
-  
     put :upload_profile_photo, :id => users(:quentin), :avatar => {:photo => fixture_file_upload('/files/library.jpg', 'image/jpg')}
-    
-    assert_redirected_to crop_profile_photo_user_path(users(:quentin).reload)    
+    assert_redirected_to crop_profile_photo_user_path(users(:quentin).reload)
   end
-  
+
   def test_create_friendship_with_invited_user
     assert_difference User, :count do
       assert_difference Friendship, :count, 2 do
         create_user({:inviter_code => users(:quentin).invite_code , :inviter_id => users(:quentin).id })
       end
     end
-    assert_response :redirect    
+    assert_response :redirect
   end
-    
+
   def test_should_update_account
     login_as :quentin
     put :update_account, :user => {:login => 'changed_login'}, :id => users(:quentin)
     assert_redirected_to user_path(users(:quentin).reload)
     assert_equal assigns(:user).login, 'changed_login'
   end
-  
+
     def test_should_remind_username
       assert_difference ActionMailer::Base.deliveries, :length, 1 do
         post :forgot_username, :email => users(:quentin).email
-        assert_redirected_to login_path    
+        assert_redirected_to login_path
       end
     end
-    
+
     def test_should_resend_activation
       users(:quentin).activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
       users(:quentin).activated_at = nil
       users(:quentin).save!
-      
+
       assert_difference ActionMailer::Base.deliveries, :length, 1 do
         post :resend_activation, :id => users(:quentin)
-        assert_redirected_to login_path    
-      end    
+        assert_redirected_to login_path
+      end
     end
-    
+
     def test_should_not_resend_activation_for_active_user
       assert_no_difference ActionMailer::Base.deliveries, :length do
         post :resend_activation, :id => users(:quentin).to_param
         assert_response :success
         assert_equal :activation_email_not_sent_message.l, flash[:notice]
-      end    
+      end
     end
-    
+
     def test_should_not_resend_activation_for_nonexistent_user
       assert_no_difference ActionMailer::Base.deliveries, :length do
-        assert_raise(ActiveRecord::RecordNotFound) {  
+        assert_raise(ActiveRecord::RecordNotFound) {
           post :resend_activation, :id => "nonexistant"
         }
-      end    
+      end
     end
-    
+
     def test_assume_should_assume_users_id
       login_as :admin
       post :assume, :id => users(:quentin)
@@ -348,7 +352,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_not_nil session[:admin_id]
       assert_equal users(:admin).id, session[:admin_id]
     end
-    
+
     def test_only_admin_can_assume_id
       login_as :quentin
       post :assume, :id => users(:aaron).id
@@ -356,7 +360,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_not_equal UserSession.find.record, users(:aaron)
       assert_nil session[:admin_id]
     end
-    
+
     def test_only_admin_can_assume_id_js
       login_as :quentin
       post :assume, :id => users(:aaron).id, :format => 'js'
@@ -364,7 +368,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_not_equal UserSession.find.record, users(:aaron)
       assert_nil session[:admin_id]
     end
-    
+
     def test_return_admin_should_set_user_to_admin
       login_as :quentin
       @request.session[:admin_id] = users(:admin).id
@@ -373,7 +377,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_nil session[:admin_id]
       assert_equal users(:admin), UserSession.find.record
     end
-    
+
     def test_only_admin_can_return_to_admin
       login_as :quentin
       @request.session[:admin_id] = users(:admin).id
@@ -382,7 +386,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_nil session[:admin_id]
       assert_equal users(:admin), UserSession.find.record
     end
-    
+
     def test_should_decrement_metro_area_count
       initial_count = metro_areas(:twincities).users_count
       quentin = users(:quentin)
@@ -390,8 +394,8 @@ class UsersControllerTest < ActionController::TestCase
       quentin.save
       assert_equal(metro_areas(:twincities).reload.users_count, metro_areas(:twincities).reload.users.size )
       assert_equal(metro_areas(:detroit).reload.users_count, metro_areas(:detroit).reload.users.size )
-    end  
-    
+    end
+
     def test_should_increment_metro_area_count
       initial_count = metro_areas(:detroit).users_count
       aaron = users(:aaron)
@@ -399,20 +403,20 @@ class UsersControllerTest < ActionController::TestCase
       aaron.save!
       assert_equal metro_areas(:detroit).reload.users_count, initial_count + 1
       assert_equal(metro_areas(:detroit).reload.users_count, metro_areas(:detroit).reload.users.size )
-    end  
-    
+    end
+
     def test_should_get_stats_if_admin
       login_as :admin
       get :statistics, :id => users(:super_writer).id
       assert_response :success
     end
-    
+
     def test_should_not_get_stats_if_not_admin
       login_as :quentin
       get :statistics, :id => users(:super_writer).id
       assert_response :redirect
     end
-    
+
     def test_should_get_with_date_param
       login_as :admin
       post = users(:quentin).posts.last
@@ -420,33 +424,33 @@ class UsersControllerTest < ActionController::TestCase
       assert_response :success
       assert !assigns(:posts).empty?
     end
-    
-    
+
+
     def test_should_get_dashboard_with_no_friends
       login_as :aaron
       assert users(:aaron).network_activity.empty?
       get :dashboard, :id => users(:aaron).friendly_id
       assert_response :success
     end
-    
+
     def test_should_get_dashboard_with_no_recommended_posts
       login_as :quentin
       users(:aaron).tag_list = 'hansel,gretel'
       users(:aaron).save
-      
+
       assert !users(:aaron).tags.reload.empty?
-    
-      assert users(:aaron).recommended_posts.empty?    
+
+      assert users(:aaron).recommended_posts.empty?
       get :dashboard, :id => users(:aaron).friendly_id
       assert_response :success
     end
-    
+
     def test_should_show_user_statistics
       login_as :admin
       get :statistics, :id => users(:quentin).id
       assert_response :success
     end
-    
+
     test 'should delete selected users in admin users action' do
       login_as :admin
       assert_difference User, :count, -1 do
@@ -454,22 +458,22 @@ class UsersControllerTest < ActionController::TestCase
       end
       assert_redirected_to admin_users_path
     end
-    
+
     test 'should store location for anonymous page' do
       return_to = session[:return_to]
       get :index
       assert_not_equal return_to, session[:return_to]
       assert_equal "http://test.host/users", session[:return_to]
     end
-    
-    
+
+
     protected
       def create_user(options = {})
         params = {:user => {:login => 'quire', :email => 'quire@example.com', :password => 'quire123', :password_confirmation => 'quire123', :birthday => configatron.min_age.years.ago}}
         user_opts = options.delete(:user)
         params[:user].merge!(user_opts) if user_opts
-      
+
         post :create, params.merge(options)
       end
-          
+
 end