Download as
Browse Code »

Commit a4b7f957fd55174083fc29dbec2fbf10df8ee507

Authored by Rodrigo Souto
2 parents a499eda4 9e89e39e
Exists in master and in 20 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_pagination, api_private_token, article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings

Merge branch 'remote_user_fix' into 'master' 

Change remote user plugin to handle any exception

Small fix to handle any possiblie exception in remote user plugin

See merge request !612
Showing 2 changed files with 11 additions and 3 deletions   Show diff stats
plugins/remote_user/lib/remote_user_plugin.rb
  Diff comments   View file @a4b7f95
... ... @@ -48,7 +48,7 @@ class RemoteUserPlugin < Noosfero::Plugin
48 48 end
49 49 end
50 50 end
51   - rescue ActiveRecord::RecordInvalid => invalid
  51 + rescue
52 52 session[:notice] = _('Could not create the remote_user.')
53 53 render_404
54 54 end
... ...
plugins/remote_user/test/functional/remote_user_plugin_test.rb
  Diff comments   View file @a4b7f95
... ... @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper'
3 3 # Re-raise errors caught by the controller.
4 4 class AccountController; def rescue_action(e) raise e end; end
5 5  
6   -class AccountControllerTest < ActionController::TestCase
  6 +class AccountControllerTest < ActionController::TestCase
7 7 def setup
8 8 @environment = Environment.default
9 9 @environment.enabled_plugins = ['RemoteUserPlugin']
... ... @@ -125,10 +125,18 @@ class AccountControllerTest &lt; ActionController::TestCase
125 125 get :index
126 126  
127 127 assert session[:user].blank?
128   -
  128 +
129 129 @request.env["HTTP_REMOTE_USER"] = ""
130 130 get :index
131 131  
132 132 assert session[:user].blank?
133 133 end
  134 +
  135 + should 'not create a new user if his informations is invalid' do
  136 + @request.env["HTTP_REMOTE_USER"] = "*%&invalid user name&%*"
  137 + get :index
  138 +
  139 + assert session[:user].blank?
  140 + assert_response 404
  141 + end
134 142 end
... ...