rails4: fix most functional tests

Braulio Bhavamitra
1 parent 1cc34ff8
Showing 121 changed files with 160 additions and 567 deletions Show diff stats
Gemfile
app/controllers/application_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/search_controller.rb
app/views/comment/_comment_form.html.erb
app/views/manage_products/new.html.erb
app/views/profile_search/_results-list.html.erb
app/views/profile_search/_results_list.html.erb
app/views/profile_search/index.html.erb
app/views/profile_search/index.js.erb
app/views/shared/logged_in/xmpp_chat.html.erb
plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
plugins/bsc/test/functional/bsc_plugin_admin_controller_test.rb
plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb
plugins/classify_members/test/functional/classify_members_plugin_test.rb
plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb
plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb
plugins/comment_group/test/functional/content_viewer_controller_test.rb
plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb
plugins/community_track/test/functional/community_track_plugin_cms_controller_test.rb
@@ -20,7 +20,7 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.8', require: 'jrails'
+gem 'eita-jrails', '>= 0.9.9', require: 'jrails'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -156,7 +156,7 @@ class ApplicationController &lt; ActionController::Base
   def render_not_found(path = nil)
     @no_design_blocks = true
     @path ||= request.path
-    render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
+    render template: 'shared/not_found', status: 404, layout: get_layout
   end
   alias :render_404 :render_not_found
  
@@ -164,7 +164,7 @@ class ApplicationController &lt; ActionController::Base
     @no_design_blocks = true
     @message = message
     @title = title
-    render :template => 'shared/access_denied.html.erb', :status => 403
+    render template: 'shared/access_denied', status: 403
   end
  
   def load_category
@@ -113,7 +113,7 @@ class AccountController &lt; ApplicationController
           @user.signup!
           owner_role = Role.find_by_name('owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
-          invitation = Task.from_code @invitation_code
+          invitation = Task.from_code(@invitation_code).first
           if invitation
             invitation.update_attributes!({:friend => @user.person})
             invitation.finish
@@ -205,7 +205,7 @@ class AccountController &lt; ApplicationController
   #
   # Posts back.
   def new_password
-    @change_password = ChangePassword.from_code params[:code]
+    @change_password = ChangePassword.from_code(params[:code]).first
  
     unless @change_password
       render :action => 'invalid_change_password_code', :status => 403
@@ -398,7 +398,7 @@ class AccountController &lt; ApplicationController
   end
  
   def load_enterprise_activation
-    @enterprise_activation ||= EnterpriseActivation.from_code params[:enterprise_code]
+    @enterprise_activation ||= EnterpriseActivation.from_code(params[:enterprise_code]).first
   end
  
   def load_enterprise
@@ -67,7 +67,7 @@ class SearchController &lt; PublicController
   end
  
   def contents
-    redirect_to params.merge(:action => :articles)
+    redirect_to url_for(params.merge action: :articles)
   end
  
   def people
@@ -124,7 +124,7 @@ class SearchController &lt; PublicController
   # keep old URLs workings
   def assets
     params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
-    redirect_to params
+    redirect_to url_for(params)
   end
  
   def tags
@@ -55,7 +55,7 @@ function check_captcha(button, confirm_action) {
 <div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %>">
  
   <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link && @comment.reply_of_id.blank? %>
-<%= remote_form_for(:comment, @comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
+<%= remote_form_for(@comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
  
   <%= required_fields_message %>
  
@@ -2,7 +2,7 @@
  
 <div id='request_result_message' style='display: none'></div>
  
-<%= remote_form_for :product, @product,
+<%= remote_form_for @product,
    :loading => "open_loading('#{ _('loading...') }')",
    :update => "request_result_message",
    :url => {:action => 'new'},
@@ -1,15 +0,0 @@
-<div id='search-content'>
-  <% if @results %>
-    <div class='results-found-message'>
-      <%= _("%s results found") % @results.total_entries %>
-    </div>
-
-    <ul class='results-list'>
-      <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
-        <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
-      <% end %>
-    </ul>
-
-    <%= pagination_links @results %>
-  <% end %>
-</div>
@@ -0,0 +1,15 @@
+<div id='search-content'>
+  <% if @results %>
+    <div class='results-found-message'>
+      <%= _("%s results found") % @results.total_entries %>
+    </div>
+
+    <ul class='results-list'>
+      <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
+        <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
+      <% end %>
+    </ul>
+
+    <%= pagination_links @results %>
+  <% end %>
+</div>
@@ -3,7 +3,7 @@
  
   <%= render :partial => 'shared/profile_search_form' %>
  
-  <%= render :partial => 'results-list' %>
+  <%= render 'results_list' %>
  
 </div>
 <%= javascript_include_tag 'search' %>
-jQuery('#search-content').html('<%= escape_javascript(render :partial => "results-list") %>');
+jQuery('#search-content').html('<%= j render 'results_list' %>');
-    <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js', :cache => 'cache/chat' %>
+    <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
     <%= stylesheet_link_tag 'perfect-scrollbar.min.css' %>
  
     <% extend ChatHelper %>
 require File.dirname(__FILE__) + '/../test_helper'
  
-class ProfileDesignController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/bsc_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class BscPluginAdminController; def rescue_action(e) raise e end; end
-
 class BscPluginAdminControllerTest < ActionController::TestCase
  
   VALID_CNPJ = '94.132.024/0001-48'
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/bsc_plugin_myprofile_controller'
  
-# Re-raise errors caught by the controller.
-class BscPluginMyprofileController; def rescue_action(e) raise e end; end
-
 class BscPluginMyprofileControllerTest < ActionController::TestCase
  
   VALID_CNPJ = '94.132.024/0001-48'
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
  
-# Re-raise errors caught by the controller.
-class HomeController
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class ProfileControllerTest < ActionController::TestCase
   def setup
     @env = Environment.default
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_plugin_profile_controller'
  
-# Re-raise errors caught by the controller.
-class CommentGroupPluginProfileController; def rescue_action(e) raise e end; end
-
 class CommentGroupPluginProfileControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/public/comment_group_plugin_public_controller'
  
-# Re-raise errors caught by the controller.
-class CommentGroupPluginPublicController; def rescue_action(e) raise e end; end
-
 class CommentGroupPluginPublicControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-class ContentViewerController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e) 
-    raise e 
-  end 
-end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class ProfileControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
  
-# Re-raise errors caught by the controller.
-class CmsController; def rescue_action(e) raise e end; end
-
 class CmsControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
  
-class ContentViewerController; def rescue_action(e) raise e end; end
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController; def rescue_action(e) raise e end; end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
 require_relative '../../controllers/myprofile/community_track_plugin_myprofile_controller'
  
-# Re-raise errors caught by the controller.
-class CommunityTrackPluginMyprofileController; def rescue_action(e) raise e end; end
-
 class CommunityTrackPluginMyprofileControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
 require_relative '../../controllers/public/community_track_plugin_public_controller'
  
-# Re-raise errors caught by the controller.
-class CommunityTrackPluginPublicController; def rescue_action(e) raise e end; end
-
 class CommunityTrackPluginPublicControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e) 
-    raise e 
-  end 
-end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
  
-# Re-raise errors caught by the controller.
-class HomeController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e) 
-    raise e 
-  end 
-end
-
 class HomeControllerTest < ActionController::TestCase
  
   def setup
@@ -22,7 +14,7 @@ class HomeControllerTest &lt; ActionController::TestCase
  
     box = create(Box, :owner => @environment)
     @block = create(ContainerBlockPlugin::ContainerBlock, :box => box)
-    
+
     @environment.boxes = [box]
   end
  
 require 'test_helper'
  
-class ContentViewerController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
  
-class ProfileDesignController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_myprofile_controller'
  
-# Re-raise errors caught by the controller.
-class CustomFormsPluginMyprofileController; def rescue_action(e) raise e end; end
-
 class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
   def setup
     @controller = CustomFormsPluginMyprofileController.new
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_profile_controller'
  
-# Re-raise errors caught by the controller.
-class CustomFormsPluginProfileController; def rescue_action(e) raise e end; end
-
 class CustomFormsPluginProfileControllerTest < ActionController::TestCase
   def setup
     @controller = CustomFormsPluginProfileController.new
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/display_content_plugin_admin_controller'
  
-
-# Re-raise errors caught by the controller.
-class DisplayContentPluginAdminControllerController; def rescue_action(e) raise e end; end
-
 class DisplayContentPluginAdminControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/display_content_plugin_myprofile_controller'
  
-
-# Re-raise errors caught by the controller.
-class DisplayContentPluginMyprofileControllerController; def rescue_action(e) raise e end; end
-
 class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
  
-# Re-raise errors caught by the controller.
-class HomeController
-  #append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
 class HomeControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
 require 'profile_editor_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileEditorController; def rescue_action(e) raise e end; end
-
 class ProfileEditorControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_controller'
  
-# Re-raise errors caught by the controller.
-class GoogleCsePluginController; def rescue_action(e) raise e end; end
-
 class GoogleCsePluginControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require 'content_viewer_controller'
  
-class ContentViewerController
-  # Re-raise errors caught by the controller.
-  def rescue_action(e) raise e end
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   all_fixtures
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class AccountController; def rescue_action(e) raise e end; end
-
 class AccountControllerPluginTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/ldap_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class LdapPluginAdminController; def rescue_action(e) raise e end; end
-
 class LdapPluginAdminControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/mark_comment_as_read_plugin_profile_controller'
  
-# Re-raise errors caught by the controller.
-class MarkCommentAsReadPluginProfileController; def rescue_action(e) raise e end; end
-
 class MarkCommentAsReadPluginProfileControllerTest < ActionController::TestCase
   def setup
     @controller = MarkCommentAsReadPluginProfileController.new
 require 'test_helper'
 require 'content_viewer_controller'
  
-# Re-raise errors caught by the controller.
-class ContentViewerController; def rescue_action(e) raise e end; end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
 require 'home_controller'
  
-# Re-raise errors caught by the controller.
-class HomeController; def rescue_action(e) raise e end; end
-
 class HomeControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
 require 'home_controller'
  
-# Re-raise errors caught by the controller.
-class ManageProductsController; def rescue_action(e) raise e end; end
-
 class ManageProductsControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController; def rescue_action(e) raise e end; end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   def setup
 require_relative '../test_helper'
 require_relative '../../controllers/people_block_plugin_profile_controller'
  
-
-# Re-raise errors caught by the controller.
-class PeopleBlockPluginProfileController; def rescue_action(e) raise e end; end
-
 class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class ProfileDesignController; def rescue_action(e) raise e end; end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class ProfileController; def rescue_action(e) raise e end; end
-
 class ProfileControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/piwik_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class PiwikPluginAdminController; def rescue_action(e) raise e end; end
-
 class PiwikPluginAdminControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
-
 require 'comment_controller'
-# Re-raise errors caught by the controller.
-class CommentController; def rescue_action(e) raise e end; end
  
 class RelevantContentBlockTest < ActiveSupport::TestCase
  
 require File.dirname(__FILE__) + '/../test_helper'
  
 require 'comment_controller'
-# Re-raise errors caught by the controller.
-class CommentController; def rescue_action(e) raise e end; end
  
 class RelevantContentBlockTest < ActiveSupport::TestCase
  
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
  
-# Re-raise errors caught by the controller.
-class AccountController; def rescue_action(e) raise e end; end
-
 class AccountControllerTest < ActionController::TestCase
   def setup
     @environment = Environment.default
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_controller'
  
-# Re-raise errors caught by the controller.
-class ShoppingCartPluginController; def rescue_action(e) raise e end; end
-
 class ShoppingCartPluginControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller'
  
-# Re-raise errors caught by the controller.
-class ContentViewerController; def rescue_action(e) raise e end; end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/social_share_privacy_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class SocialSharePrivacyPluginAdminController; def rescue_action(e) raise e end; end
-
 class SocialSharePrivacyPluginAdminControllerTest < ActionController::TestCase
  
   def setup
 require "#{File.dirname(__FILE__)}/../test_helper"
 require File.dirname(__FILE__) + '/../../lib/ext/facets_browse'
  
-# Re-raise errors caught by the controller.
-class SearchController; def rescue_action(e) raise e end; end
-
 class SearchControllerTest < ActionController::TestCase
  
   def setup
 require 'test_helper'
 require File.dirname(__FILE__) + '/../../controllers/spaminator_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class SpaminatorPluginAdminController; def rescue_action(e) raise e end; end
-
 class SpaminatorPluginAdminControllerTest < ActionController::TestCase
   def setup
     @controller = SpaminatorPluginAdminController.new
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController; def rescue_action(e) raise e end; end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   def setup
@@ -136,7 +133,7 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
  
     assert_tag :input, :attributes => {:id => 'block_product_counter'}
     assert_no_tag :input, :attributes => {:id => 'block_product_counter', :checked => 'checked'}
-  end  
+  end
  
   should 'not input category counter be checked by default' do
     get :edit, :id => @block.id
@@ -162,4 +159,4 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
  
     assert_no_tag :input, :attributes => {:id => 'block_hit_counter', :checked => 'checked'}
   end
-end
 \ No newline at end of file
+end
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class HomeController; def rescue_action(e) raise e end; end
-
 class HomeControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class ProfileDesignController; def rescue_action(e) raise e end; end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../app/controllers/public/account_controller'
  
-# Re-raise errors caught by the controller.
-class AccountController; def rescue_action(e) raise e end; end
-
 class AccountControllerTest < ActionController::TestCase
  
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller'
  
-# Re-raise errors caught by the controller.
-class InviteController; def rescue_action(e) raise e end; end
-
 class InviteControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../app/controllers/my_profile/profile_editor_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileEditorController; def rescue_action(e) raise e end; end
-
 class StoaPluginProfileEditorControllerTest < ActionController::TestCase
  
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/stoa_plugin_controller'
  
-# Re-raise errors caught by the controller.
-class StoaPluginController; def rescue_action(e) raise e end; end
-
 class StoaPluginControllerTest < ActionController::TestCase
  
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_myprofile_controller'
  
-# Re-raise errors caught by the controller.
-class SubOrganizationsPluginMyprofileController; def rescue_action(e) raise e end; end
-
 class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
   def setup
     @controller = SubOrganizationsPluginMyprofileController.new
@@ -94,7 +91,7 @@ class SubOrganizationsPluginMyprofileControllerTest &lt; ActionController::TestCase
     get :index, :profile => organization.identifier
  
     assert_response 403
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'not search organizations if dont have permission' do
@@ -107,7 +104,7 @@ class SubOrganizationsPluginMyprofileControllerTest &lt; ActionController::TestCase
     get :search_organization, :profile => organization.identifier, :q => 'sampl'
  
     assert_response 403
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
 end
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_profile_controller'
  
-# Re-raise errors caught by the controller.
-class SubOrganizationsPluginProfileController; def rescue_action(e) raise e end; end
-
 class SubOrganizationsPluginProfileControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController; def rescue_action(e) raise e end; end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../test_helper'
  
-# Re-raise errors caught by the controller.
-class ProfileDesignController; def rescue_action(e) raise e end; end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/vote_plugin_admin_controller'
  
-# Re-raise errors caught by the controller.
-class VotePluginAdminController; def rescue_action(e) raise e end; end
-
 class VotePluginAdminControllerTest < ActionController::TestCase
  
   def setup
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../controllers/vote_plugin_profile_controller'
  
-# Re-raise errors caught by the controller.
-class VotePluginProfileController; def rescue_action(e) raise e end; end
-
 class VotePluginProfileControllerTest < ActionController::TestCase
  
   def setup
 require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 require 'cms_controller'
  
-# Re-raise errors caught by the controller.
-class CmsController; def rescue_action(e) raise e end; end
-
 class CmsControllerTest < ActionController::TestCase
  
   def setup
@@ -22,7 +19,7 @@ class CmsControllerTest &lt; ActionController::TestCase
     work_assignment = create_work_assignment('Work Assignment', @organization, nil, nil)
     get :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'allow members to upload submissions on work_assignment' do
 require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 require 'content_viewer_controller'
  
-# Re-raise errors caught by the controller.
-class ContentViewerController; def rescue_action(e) raise e end; end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
@@ -30,7 +27,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     get :view_page, :profile => @organization.identifier, :page => submission.path
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     WorkAssignmentPlugin.stubs(:can_download_submission?).returns(true)
  
 require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 require 'work_assignment_plugin_myprofile_controller'
  
-# Re-raise errors caught by the controller.
-class WorkAssignmentPluginMyprofileController; def rescue_action(e) raise e end; end
-
 class WorkAssignmentPluginMyprofileControllerTest < ActionController::TestCase
  
   def setup
@@ -40,9 +37,9 @@ class WorkAssignmentPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal false, submission.parent.published
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     submission.reload
     assert_equal false, submission.published
@@ -56,9 +53,9 @@ class WorkAssignmentPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal true, @person.is_admin?
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     submission.reload
     assert_equal false, submission.published
@@ -120,10 +117,10 @@ class WorkAssignmentPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal(submission.author, @person)
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     submission.reload
     assert_equal false, submission.parent.published
@@ -174,10 +171,10 @@ class WorkAssignmentPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal false, (@person.is_member_of? submission.profile)
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     submission.reload
     assert_equal false, submission.parent.published
 require_relative "../test_helper"
 require 'account_controller'
  
-# Re-raise errors caught by the controller.
-class AccountController; def rescue_action(e) raise e end; end
-
 class AccountControllerTest < ActionController::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead
   # Then, you can remove it from this and the units test.
@@ -240,28 +237,20 @@ class AccountControllerTest &lt; ActionController::TestCase
   end
  
   should 'provide interface for entering new password' do
-    change = ChangePassword.new
-    ChangePassword.expects(:from_code).with('osidufgiashfkjsadfhkj99999').returns(change)
-    person = mock
-    person.stubs(:identifier).returns('joe')
-    person.stubs(:name).returns('Joe')
-    change.stubs(:requestor).returns(person)
+    code = 'osidufgiashfkjsadfhkj99999'
+    person = create_user('joe').person
+    change = ChangePassword.create! code: code, requestor: person
  
-    get :new_password, :code => 'osidufgiashfkjsadfhkj99999'
+    get :new_password, code: code
     assert_equal change, assigns(:change_password)
   end
  
   should 'actually change password after entering new password' do
-    change = ChangePassword.new
-    ChangePassword.expects(:from_code).with('osidufgiashfkjsadfhkj99999').returns(change)
+    code = 'osidufgiashfkjsadfhkj99999'
+    person = create_user('joe').person
+    ChangePassword.create! code: code, requestor: person
  
-    requestor = mock
-    requestor.stubs(:identifier).returns('joe')
-    change.stubs(:requestor).returns(requestor)
-    change.expects(:update_attributes!).with({'password' => 'newpass', 'password_confirmation' => 'newpass'})
-    change.expects(:finish)
-
-    post :new_password, :code => 'osidufgiashfkjsadfhkj99999', :change_password => { :password => 'newpass', :password_confirmation => 'newpass' }
+    post :new_password, code: code, change_password: { password: 'newpass', password_confirmation: 'newpass' }
  
     assert_template 'new_password_ok'
   end
@@ -323,8 +312,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     person = create_user('mylogin').person
     login_as(person.identifier)
  
-    EnterpriseActivation.expects(:from_code).with('some_invalid_code').returns(nil).at_least_once
-
     get :activation_question, :enterprise_code => 'some_invalid_code'
  
     assert_template 'invalid_enterprise_code'
@@ -336,9 +323,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => true)
     ent.update_attribute(:cnpj, '0'*14)
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -350,10 +335,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     login_as(person.identifier)
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent')
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -365,10 +347,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     login_as(person.identifier)
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -381,10 +360,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -397,10 +373,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:cnpj, '0'*14)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -414,10 +387,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
     ent.block
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -430,10 +400,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :activation_question, :enterprise_code => '0123456789'
  
@@ -443,10 +410,7 @@ class AccountControllerTest &lt; ActionController::TestCase
   should 'require login for accept terms' do
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).never
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).never
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :accept_terms, :enterprise_code => '0123456789', :answer => '1998'
  
@@ -459,10 +423,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :accept_terms, :enterprise_code => '0123456789', :answer => '1997'
  
@@ -483,8 +444,7 @@ class AccountControllerTest &lt; ActionController::TestCase
  
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :accept_terms, :enterprise_code => '0123456789', :answer => '1998'
  
@@ -500,10 +460,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     ent.update_attribute(:foundation_year, 1998)
     ent.block
     ent.save
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     get :accept_terms, :enterprise_code => '0123456789', :answer => 1998
  
@@ -516,8 +473,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     env.save!
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).never
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
  
@@ -525,13 +481,12 @@ class AccountControllerTest &lt; ActionController::TestCase
   end
  
   should 'not activate if user does not accept terms' do
-    ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
-    ent.update_attribute(:foundation_year, 1998)
     p = create_user('test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com').person
     login_as(p.identifier)
  
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
+    ent.update_attribute(:foundation_year, 1998)
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => false
     ent.reload
@@ -541,13 +496,12 @@ class AccountControllerTest &lt; ActionController::TestCase
   end
  
   should 'activate enterprise and make logged user admin' do
-    ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
-    ent.update_attribute(:foundation_year, 1998)
     p = create_user('test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com').person
     login_as(p.identifier)
  
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
+    ent.update_attribute(:foundation_year, 1998)
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
     ent.reload
@@ -565,8 +519,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     env.save!
     ent = fast_create(Enterprise, :name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     ent.update_attribute(:foundation_year, 1998)
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:from_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.create! code: '0123456789', enterprise: ent
  
     post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
  
 require_relative "../test_helper"
 require 'admin_controller'
  
-# Re-raise errors caught by the controller.
-class AdminController; def rescue_action(e) raise e end; end
-
 class AdminControllerTest < ActionController::TestCase
  
   should 'inherit from ApplicationController' do
 require_relative "../test_helper"
 require 'admin_panel_controller'
  
-# Re-raise errors caught by the controller.
-class AdminPanelController; def rescue_action(e) raise e end; end
-
 class AdminPanelControllerTest < ActionController::TestCase
  
   all_fixtures
@@ -127,7 +124,7 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
   should 'sanitize message for disabled enterprise with white_list' do
     post :site_info, :environment => { :message_for_disabled_enterprise => "This <strong>is</strong> <script>alert('alow')</script>my new environment" }
     assert_redirected_to :action => 'index'
-    assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
+    assert_equal "This <strong>is</strong> alert('alow')my new environment", Environment.default.message_for_disabled_enterprise
   end
  
   should 'save site article date format option' do
@@ -2,9 +2,6 @@
 require_relative "../test_helper"
 require 'test_controller'
  
-# Re-raise errors caught by the controller.
-class TestController; def rescue_action(e) raise e end; end
-
 class ApplicationControllerTest < ActionController::TestCase
   all_fixtures
   def setup
 require_relative "../test_helper"
 require 'catalog_controller'
  
-# Re-raise errors caught by the controller.
-class CatalogController; def rescue_action(e) raise e end; end
-
 class CatalogControllerTest < ActionController::TestCase
   def setup
     @controller = CatalogController.new
 require_relative "../test_helper"
 require 'categories_controller'
  
-# Re-raise errors caught by the controller.
-class CategoriesController; def rescue_action(e) raise e end; end
-
 class CategoriesControllerTest < ActionController::TestCase
   all_fixtures
   def setup
     @controller = CategoriesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-   
+
     @env = fast_create(Environment, :name => "My test environment")
     Environment.stubs(:default).returns(env)
     assert (@cat1 = env.categories.create(:name => 'a test category'))
@@ -25,9 +22,6 @@ class CategoriesControllerTest &lt; ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    assert_kind_of Array, assigns(:categories)
-    assert_kind_of Array, assigns(:product_categories)
-    assert_kind_of Array, assigns(:regions)
     assert_tag :tag => 'a', :attributes => { :href => '/admin/categories/new'}
   end
  
 require_relative "../test_helper"
 require 'cms_controller'
  
-# Re-raise errors caught by the controller.
-class CmsController; def rescue_action(e) raise e end; end
-
 class CmsControllerTest < ActionController::TestCase
  
   include NoosferoTestHelper
@@ -1237,7 +1234,7 @@ class CmsControllerTest &lt; ActionController::TestCase
  
     get :new, :profile => c.identifier
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'allow user with permission create an article in community' do
@@ -1259,7 +1256,7 @@ class CmsControllerTest &lt; ActionController::TestCase
  
     get :edit, :profile => c.identifier, :id => a.id
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'not allow user edit article if he is owner but has no publish permission' do
@@ -1270,7 +1267,7 @@ class CmsControllerTest &lt; ActionController::TestCase
  
     get :edit, :profile => c.identifier, :id => a.id
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'allow user edit article if he is owner and has publish permission' do
@@ -1782,7 +1779,7 @@ class CmsControllerTest &lt; ActionController::TestCase
  
     get :upload_files, :profile => c.identifier, :parent_id => a.id
     assert_response :forbidden
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'filter profile folders to select' do
 require_relative "../test_helper"
 require 'comment_controller'
  
-# Re-raise errors caught by the controller.
-class CommentController; def rescue_action(e) raise e end; end
-
 class CommentControllerTest < ActionController::TestCase
  
   def setup
@@ -358,7 +355,7 @@ class CommentControllerTest &lt; ActionController::TestCase
   should "render the root comment when a reply is made" do
     login_as profile.identifier
     page = profile.articles.create!(:name => 'myarticle')
- 
+
     comment = fast_create(Comment, :body => 'some content', :source_id => page.id, :source_type => 'Article')
  
     xhr :post, :create, :profile => profile.identifier, :id => page.id, :comment => {:body => 'Some comment...', :reply_of_id => comment.id}, :confirm => 'true'
@@ -2,9 +2,6 @@
 require_relative "../test_helper"
 require 'contact_controller'
  
-# Re-raise errors caught by the controller.
-class ContactController; def rescue_action(e) raise e end; end
-
 class ContactControllerTest < ActionController::TestCase
  
   all_fixtures
@@ -140,7 +137,7 @@ class ContactControllerTest &lt; ActionController::TestCase
     post :new, :profile => community.identifier
  
     assert_response :forbidden
-    assert_template :access_denied
+    assert_template 'shared/access_denied'
   end
  
   should 'show send e-mail page to members of private community' do
 require_relative "../test_helper"
 require 'content_viewer_controller'
  
-# Re-raise errors caught by the controller.
-class ContentViewerController; def rescue_action(e) raise e end; end
-
 class ContentViewerControllerTest < ActionController::TestCase
  
   all_fixtures
@@ -194,7 +191,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     get :view_page, :profile => community.identifier, :page => [ folder.path ]
  
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'show private content to profile moderators' do
@@ -297,7 +294,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
  
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'give access to private articles if logged in and moderator' do
@@ -3,9 +3,6 @@
 require_relative "../test_helper"
 require 'edit_template_controller'
  
-# Re-raise errors caught by the controller.
-class EditTemplateController; def rescue_action(e) raise e end; end
-
 class EditTemplateControllerTest < ActionController::TestCase
   all_fixtures
   def setup
 require_relative "../test_helper"
 require 'enterprise_registration_controller'
  
-# Re-raise errors caught by the controller.
-class EnterpriseRegistrationController; def rescue_action(e) raise e end; end
-
 class EnterpriseRegistrationControllerTest < ActionController::TestCase
  
   # all_fixtures:users
@@ -159,7 +156,7 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
     post :index, :create_enterprise => { 'name' => 'name', 'identifier' => 'mynew', :economic_activity => '<b>economic_activity</b>' }
     assert_sanitized assigns(:create_enterprise).economic_activity
   end
-  
+
   should 'filter html from management_information' do
     post :index, :create_enterprise => { 'name' => 'name', 'identifier' => 'mynew', :management_information => '<b>management_information</b>' }
     assert_sanitized assigns(:create_enterprise).management_information
 require_relative "../test_helper"
 require 'enterprise_validation_controller'
  
-# Re-raise errors caught by the controller.
-class EnterpriseValidationController; def rescue_action(e) raise e end; end
-
 class EnterpriseValidationControllerTest < ActionController::TestCase
  
   all_fixtures
@@ -12,7 +9,7 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
     @controller = EnterpriseValidationController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    
+
     login_as 'ze'
     @org = Organization.create!(:identifier => 'myorg', :name => "My Org")
     give_permission('ze', 'validate_enterprise', @org)
@@ -78,7 +75,7 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
   should 'list validations already processed' do
     processed_validations = [CreateEnterprise.new]
     @org.expects(:processed_validations).returns(processed_validations)
-    
+
     get :list_processed, :profile => 'myorg'
  
     assert_equal processed_validations, assigns(:processed_validations)
@@ -86,7 +83,7 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'list_processed'
   end
-  
+
   should 'be able to display a validation that was already processed' do
     validation = CreateEnterprise.new
     @org.expects(:find_processed_validation).with('kakakaka').returns(validation)
@@ -106,7 +103,7 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
     info = ValidationInfo.new(:validation_methodology => 'none')
     @org.expects(:validation_info).returns(info)
     post :edit_validation_info, :profile => 'myorg', :info => {:validation_methodology => 'new methodology'}
-    
+
     assert_response :redirect
     assert_redirected_to :action => 'index'
     assert_equal info, assigns(:info)
@@ -116,7 +113,7 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
     info = ValidationInfo.new(:validation_methodology => 'none')
     @org.expects(:validation_info).returns(info)
     post :edit_validation_info, :profile => 'myorg', :info => {:validation_methodology => ''}
-    
+
     assert_response :success
     assert_equal info, assigns(:info)
   end
 require_relative "../test_helper"
 require 'environment_design_controller'
  
-# Re-raise errors caught by the controller.
-class EnvironmentDesignController; def rescue_action(e) raise e end; end
-
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
   ALL_BLOCKS = [ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
 require_relative "../test_helper"
 require 'environment_role_manager_controller'
  
-# Re-raise errors caught by the controller.
-class EnvironmentRoleManagerController; def rescue_action(e) raise e end; end
-
 class EnvironmentRoleManagerControllerTest < ActionController::TestCase
   def setup
     @controller = EnvironmentRoleManagerController.new
 require_relative "../test_helper"
  
-class EnvironmentThemesController; def rescue_action(e) raise e end; end
-
 class EnvironmentThemesControllerTest < ActionController::TestCase
  
   def setup
@@ -69,7 +69,7 @@ class EventsControllerTest &lt; ActionController::TestCase
     post :events, :profile => community.identifier
  
     assert_response :forbidden
-    assert_template :access_denied
+    assert_template 'shared/access_denied'
   end
  
   should 'show events page to members of private community' do
 require_relative "../test_helper"
 require 'favorite_enterprises_controller'
  
-class FavoriteEnterprisesController; def rescue_action(e) raise e end; end
-
 class FavoriteEnterprisesControllerTest < ActionController::TestCase
  
-  noosfero_test :profile => 'testuser'
-
+  self.default_params = {profile: 'testuser'}
   def setup
     @controller = FavoriteEnterprisesController.new
     @request    = ActionController::TestRequest.new
@@ -31,7 +28,7 @@ class FavoriteEnterprisesControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'add'
  
-    ok("must load the favorite enterprise being added to display") { favorite_enterprise == assigns(:favorite_enterprise) } 
+    ok("must load the favorite enterprise being added to display") { favorite_enterprise == assigns(:favorite_enterprise) }
  
   end
  
 require_relative "../test_helper"
 require 'features_controller'
  
-# Re-raise errors caught by the controller.
-class FeaturesController; def rescue_action(e) raise e end; end
-
 class FeaturesControllerTest < ActionController::TestCase
  
-  all_fixtures 
+  all_fixtures
   def setup
     @controller = FeaturesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     login_as(create_admin_user(Environment.find(2)))
   end
-  
+
   def test_listing_features
     uses_host 'anhetegua.net'
     get :index
@@ -37,7 +34,7 @@ class FeaturesControllerTest &lt; ActionController::TestCase
     assert_kind_of String, session[:notice]
     v = Environment.find(environments(:anhetegua_net).id)
     assert v.enabled?('feature2')
-    assert v.enabled?('feature2') 
+    assert v.enabled?('feature2')
     assert !v.enabled?('feature3')
   end
  
 require_relative "../test_helper"
 require 'friends_controller'
  
-class FriendsController; def rescue_action(e) raise e end; end
-
 class FriendsControllerTest < ActionController::TestCase
  
-  noosfero_test :profile => 'testuser'
-
+  self.default_params = {profile: 'testuser'}
   def setup
     @controller = FriendsController.new
     @request    = ActionController::TestRequest.new
 require_relative "../test_helper"
 require 'home_controller'
  
-# Re-raise errors caught by the controller.
-class HomeController; def rescue_action(e) raise e end; end
-
 class HomeControllerTest < ActionController::TestCase
  
   def teardown
 require_relative "../test_helper"
 require 'licenses_controller'
  
-# Re-raise errors caught by the controller.
-class LIcensesController; def rescue_action(e) raise e end; end
-
 class LicensesControllerTest < ActionController::TestCase
  
   def setup
 require_relative "../test_helper"
 require 'manage_products_controller'
  
-# Re-raise errors caught by the controller.
-class ManageProductsController; def rescue_action(e) raise e end; end
-
 class ManageProductsControllerTest < ActionController::TestCase
   all_fixtures
   def setup
@@ -23,7 +20,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
     login_as :user_test
     get 'index', :profile => @enterprise.identifier
     assert :success
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should "get index" do
 require_relative "../test_helper"
 require 'map_balloon_controller'
  
-
-# Re-raise errors caught by the controller.
-class MapBalloonController; def rescue_action(e) raise e end; end
-
 class MapBalloonControllerTest < ActionController::TestCase
  
   def setup
@@ -2,9 +2,6 @@
 require_relative "../test_helper"
 require 'maps_controller'
  
-# Re-raise errors caught by the controller.
-class MapsController; def rescue_action(e) raise e end; end
-
 class MapsControllerTest < ActionController::TestCase
  
   def setup
@@ -30,8 +27,8 @@ class MapsControllerTest &lt; ActionController::TestCase
     city = 'Santo Afonso'
     state = 'Mato Grosso'
  
-    fast_create(NationalRegion, :name => 'Brasil', 
-      :national_region_code => 'BR', 
+    fast_create(NationalRegion, :name => 'Brasil',
+      :national_region_code => 'BR',
       :national_region_type_id => NationalRegionType::COUNTRY)
  
     parent_region = fast_create(NationalRegion, :name => state,
@@ -43,7 +40,7 @@ class MapsControllerTest &lt; ActionController::TestCase
                                 :national_region_type_id => NationalRegionType::CITY,
                                 :parent_national_region_code => parent_region.national_region_code)
  
-    post :edit_location, :profile => profile.identifier, :profile_data => { 
+    post :edit_location, :profile => profile.identifier, :profile_data => {
       :address => 'new address',
       :country => 'BR',
       :city => city,
 require_relative "../test_helper"
 require 'memberships_controller'
  
-
-# Re-raise errors caught by the controller.
-class MembershipsController; def rescue_action(e) raise e end; end
-
 class MembershipsControllerTest < ActionController::TestCase
  
   include ApplicationHelper
 require_relative "../test_helper"
 require 'my_profile_controller'
  
-# Re-raise errors caught by the controller.
-class MyProfileController; def rescue_action(e) raise e end; end
-
 class OnlyForPersonTestController < MyProfileController
   requires_profile_class Person
   def index
 require_relative "../test_helper"
 require 'organizations_controller'
  
-# Re-raise errors caught by the controller.
-class OrganizationsController; def rescue_action(e) raise e end; end
-
 class OrganizationsControllerTest < ActionController::TestCase
  
   def setup
@@ -11,13 +8,11 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
  
-    Environment.destroy_all
-    @environment = fast_create(Environment, :is_default => true)
+    @environment = Environment.default
  
     admin_user = create_user_with_permission('adminuser', 'manage_environment_organizations', environment)
     login_as('adminuser')
   end
-
   attr_accessor :environment
  
   should 'not access without right permission' do
@@ -40,7 +35,7 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
     get :index, :filter => 'enabled'
  
     assert_match(/enabled community/, @response.body)
-    assert_not_match(/disabled community/, @response.body)
+    assert_no_match(/disabled community/, @response.body)
   end
  
   should 'show list to activate organizations' do
@@ -50,7 +45,7 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
  
     get :index, :filter => 'disabled'
  
-    assert_not_match(/enabled community/, @response.body)
+    assert_no_match(/enabled community/, @response.body)
     assert_match(/disabled community/, @response.body)
   end
  
@@ -61,7 +56,7 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
     get :index, :type => 'Enterprise'
  
     assert_match(/Enterprise Test/, @response.body)
-    assert_not_match(/Community Test/, @response.body)
+    assert_no_match(/Community Test/, @response.body)
   end
  
   should 'show list only of communities' do
@@ -70,7 +65,7 @@ class OrganizationsControllerTest &lt; ActionController::TestCase
  
     get :index, :type => 'Community'
  
-    assert_not_match(/Enterprise Test/, @response.body)
+    assert_no_match(/Enterprise Test/, @response.body)
     assert_match(/Community Test/, @response.body)
   end
  
 require_relative "../test_helper"
+require 'plugin_admin_controller'
  
 class PluginAdminController
   def index
@@ -8,6 +9,10 @@ end
  
 class PluginAdminControllerTest < ActionController::TestCase
  
+  def setup
+    @controller = PluginAdminController.new
+  end
+
   should 'allow user with the required permission to access plugin administration page' do
     create_user_with_permission('testuser', 'edit_environment_features', Environment.default)
     login_as('testuser')
 require_relative "../test_helper"
 require 'plugins_controller'
  
-# Re-raise errors caught by the controller.
-class PluginsController; def rescue_action(e) raise e end; end
-
 class PluginsControllerTest < ActionController::TestCase
  
   all_fixtures
 require_relative "../test_helper"
 require 'profile_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileController; def rescue_action(e) raise e end; end
-
 class ProfileControllerTest < ActionController::TestCase
+
+  self.default_params = {profile: 'testuser'}
   def setup
     Environment.default.enable('products_for_enterprises')
     @profile = create_user('testuser').person
   end
   attr_reader :profile
  
-  noosfero_test :profile => 'testuser'
-
   should 'list friends' do
     get :friends
  
 require_relative "../test_helper"
 require 'profile_design_controller'
  
-class ProfileDesignController; def rescue_action(e) raise e end; end
-
 class ProfileDesignControllerTest < ActionController::TestCase
  
   COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
 require_relative "../test_helper"
 require 'profile_editor_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileEditorController; def rescue_action(e) raise e end; end
-
 class ProfileEditorControllerTest < ActionController::TestCase
   all_fixtures
  
 require_relative "../test_helper"
 require 'profile_members_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileMembersController; def rescue_action(e) raise e end; end
-
 class ProfileMembersControllerTest < ActionController::TestCase
   def setup
     super
@@ -20,7 +17,7 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
     get 'index', :profile => 'test_enterprise'
  
     assert_response 403
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
   end
  
   should 'access index' do
@@ -28,7 +28,7 @@ class ProfileRolesControllerTest &lt; ActionController::TestCase
     post :create, :profile => community.identifier, :role => {:name => "new_admin", :permissions => ["edit_profile"] }
  
     assert_response 403
-    assert_template 'access_denied'
+    assert_template 'shared/access_denied'
  
     role = Role.where(:name => 'new_admin')
  
 require_relative "../test_helper"
 require 'profile_search_controller'
  
-# Re-raise errors caught by the controller.
-class ProfileSearchController; def rescue_action(e) raise e end; end
-
 class ProfileSearchControllerTest < ActionController::TestCase
   def setup
     @controller = ProfileSearchController.new
@@ -96,7 +93,7 @@ class ProfileSearchControllerTest &lt; ActionController::TestCase
   end
  
   should 'display number of results found' do
-    article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :body => 'Article to test profile search', :profile => person)
+    article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person)
     article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person)
  
     get 'index', :profile => person.identifier, :q => 'article to test'
 require_relative "../test_helper"
-# require 'profile_themes_controller'
-
-class ProfileThemesController; def rescue_action(e) raise e end; end
  
 class ProfileThemesControllerTest < ActionController::TestCase
  
@@ -116,7 +113,7 @@ class ProfileThemesControllerTest &lt; ActionController::TestCase
  
   should 'create a new theme' do
     post :new, :profile => 'testinguser', :name => 'My theme'
-    
+
     ok('theme should be created') do
       profile.themes.first.id == 'my-theme'
     end
@@ -197,7 +194,7 @@ class ProfileThemesControllerTest &lt; ActionController::TestCase
   should 'display "add image" button' do
     theme = Theme.create('mytheme', :owner => profile)
     get :edit, :profile => 'testinguser', :id => 'mytheme'
-    
+
     assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/add_image/mytheme' }
   end
  
 require_relative "../test_helper"
 require 'public_controller'
  
-# Re-raise errors caught by the controller.
-class PublicController; def rescue_action(e) raise e end; end
-
 class PublicControllerTest < ActionController::TestCase
  
   should 'inherit from ApplicationController' do
 require_relative "../test_helper"
 require 'region_validators_controller'
  
-# Re-raise errors caught by the controller.
-class RegionValidatorsController; def rescue_action(e) raise e end; end
-
 class RegionValidatorsControllerTest < ActionController::TestCase
   all_fixtures
   def setup
@@ -12,7 +9,7 @@ class RegionValidatorsControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     login_as('ze')
   end
-  
+
   # Replace this with your real tests.
   should 'list regions at index' do
     get :index
@@ -39,7 +36,7 @@ class RegionValidatorsControllerTest &lt; ActionController::TestCase
  
   should 'search possible validators by name' do
     environment = fast_create(Environment, :name => "my environment")
-    give_permission('ze', 'manage_environment_validators', environment)    
+    give_permission('ze', 'manage_environment_validators', environment)
     region = Region.new(:name => 'my region')
     environment.regions << region
     assert !region.new_record?
@@ -84,7 +81,7 @@ class RegionValidatorsControllerTest &lt; ActionController::TestCase
     post :remove, :id => region.id, :validator_id => org.id
     assert_response :redirect
     assert_redirected_to :action => 'region', :id => region.id
-    
+
     assert !Region.find(region.id).validators.include?(org)
   end
  
 require_relative "../test_helper"
 require 'role_controller'
  
-# Re-raise errors caught by the controller.
-class RoleController; def rescue_action(e) raise e end; end
-
 class RoleControllerTest < ActionController::TestCase
   all_fixtures
  
@@ -26,13 +23,13 @@ class RoleControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'show'
     assert assigns(:role)
-    assert_equal @role.id, assigns(:role).id 
+    assert_equal @role.id, assigns(:role).id
   end
  
   def test_can_edit
     get 'edit', :id => @role.id
     assert_not_nil assigns(:role)
-    assert_equal @role.id, assigns(:role).id 
+    assert_equal @role.id, assigns(:role).id
   end
  
   def test_should_update_to_valid_parameters
@@ -42,7 +39,7 @@ class RoleControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:role)
     assert_nil session[:notice]
   end
-  
+
   def test_should_not_update_to_invalid_paramters
     Role.any_instance.stubs(:valid?).returns(false)
     post 'update', :id => @role.id
@@ -2,9 +2,6 @@
 require_relative "../test_helper"
 require 'search_controller'
  
-# Re-raise errors caught by the controller.
-class SearchController; def rescue_action(e) raise e end; end
-
 class SearchControllerTest < ActionController::TestCase
  
   def setup
@@ -54,7 +51,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'search only in specified types of content' do
     get :articles, :query => 'something not important'
-    assert_equal ['articles'], assigns(:searches).keys
+    assert_equal [:articles], assigns(:searches).keys
   end
  
   should 'render success in search' do
 require_relative "../test_helper"
 require 'system_controller'
  
-# Re-raise errors caught by the controller.
-class SystemController; def rescue_action(e) raise e end; end
-
 class SystemControllerTest < ActionController::TestCase
   def setup
     @controller = SystemController.new
 require_relative "../test_helper"
 require 'tasks_controller'
  
-class TasksController; def rescue_action(e) raise e end; end
-
 class TasksControllerTest < ActionController::TestCase
  
-  noosfero_test :profile => 'testuser'
-
+  self.default_params = {profile: 'testuser'}
   def setup
     @controller = TasksController.new
     @request    = ActionController::TestRequest.new
@@ -149,7 +146,7 @@ class TasksControllerTest &lt; ActionController::TestCase
  
   should 'create a ticket with profile requestor' do
     post :new, :profile => profile.identifier, :ticket => {:name => 'new task'}
-    
+
     assert_equal profile, assigns(:ticket).requestor
   end
  
@@ -628,7 +625,7 @@ class TasksControllerTest &lt; ActionController::TestCase
  
     assert_select ".task_responsible select", 0
     assert_select ".task_responsible .value"
-  end 
+  end
  
   should 'store the person who closes a task' do
     t = profile.tasks.build; t.save!
 require_relative "../test_helper"
 require 'templates_controller'
  
-# Re-raise errors caught by the controller.
-class TemplatesController; def rescue_action(e) raise e end; end
-
 class TemplatesControllerTest < ActionController::TestCase
  
   def setup
     @controller = TemplatesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    Environment.destroy_all
-    @environment = fast_create(Environment, :is_default => true)
+
+    @environment = Environment.default
     login_as(create_admin_user(@environment))
   end
-
   attr_accessor :environment
  
   should 'create person template' do
@@ -37,9 +33,9 @@ class TemplatesControllerTest &lt; ActionController::TestCase
     c1= fast_create(Community, :is_template => true, :environment_id => environment.id)
     environment.community_default_template= c1
     environment.save
- 
+
     c3 = fast_create(Community, :is_template => true, :environment_id => environment.id)
-   
+
     post :set_community_as_default, :template_id => c3.id
     environment.reload
     assert_equal c3, environment.community_default_template
@@ -50,9 +46,9 @@ class TemplatesControllerTest &lt; ActionController::TestCase
     p1= fast_create(Person, :is_template => true, :environment_id => environment.id)
     environment.person_default_template= p1
     environment.save
- 
+
     p3 = fast_create(Person, :is_template => true, :environment_id => environment.id)
-   
+
     post :set_person_as_default, :template_id => p3.id
     environment.reload
     assert_equal p3, environment.person_default_template
@@ -63,9 +59,9 @@ class TemplatesControllerTest &lt; ActionController::TestCase
     e1= fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
     environment.enterprise_default_template= e1
     environment.save
- 
+
     e3 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
-   
+
     post :set_enterprise_as_default, :template_id => e3.id
     environment.reload
     assert_equal e3, environment.enterprise_default_template
@@ -89,10 +85,10 @@ class TemplatesControllerTest &lt; ActionController::TestCase
     p1= fast_create(Person, :is_template => true, :environment_id => environment.id)
     environment.person_default_template= p1
     environment.save
- 
+
     env2 = fast_create(Environment)
     p3 = fast_create(Person, :is_template => true, :environment_id => env2.id)
-   
+
     post :set_person_as_default, :template_id => p3.id
     environment.reload
     assert_not_equal p3, environment.person_default_template
@@ -103,10 +99,10 @@ class TemplatesControllerTest &lt; ActionController::TestCase
     e1= fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
     environment.enterprise_default_template= e1
     environment.save
- 
+
     env2 = fast_create(Environment)
     e3 = fast_create(Enterprise, :is_template => true, :environment_id => env2.id)
-   
+
     post :set_enterprise_as_default, :template_id => e3.id
     environment.reload
     assert_not_equal e3, environment.enterprise_default_template
 require_relative "../test_helper"
 require 'trusted_sites_controller'
  
-# Re-raise errors caught by the controller.
-class TrustedSitesController; def rescue_action(e) raise e end; end
-
 class TrustedSitesControllerTest < ActionController::TestCase
   all_fixtures
  
 require_relative "../test_helper"
 require 'users_controller'
  
-# Re-raise errors caught by the controller.
-class UsersController; def rescue_action(e) raise e end; end
-
 class UsersControllerTest < ActionController::TestCase
  
   def setup
@@ -11,14 +8,11 @@ class UsersControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
  
-    Environment.destroy_all
-    @environment = fast_create(Environment, :is_default => true)
- 
+    @environment = Environment.default
  
     admin_user = create_user_with_permission('adminuser', 'manage_environment_users', environment)
     login_as('adminuser')
   end
-
   attr_accessor :environment
  
   should 'not access without right permission' do
@@ -69,7 +63,6 @@ class UsersControllerTest &lt; ActionController::TestCase
  
   should 'set admin role' do
     person = create_user.person
-    Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment => environment, :permissions => ['view_environment_admin_panel'])
     assert_equal false, person.is_admin?
     post :set_admin_role, :id => person.id, :q => ''
     person.reload
@@ -78,7 +71,6 @@ class UsersControllerTest &lt; ActionController::TestCase
  
   should 'reset admin role' do
     person = create_user.person
-    Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment => environment, :permissions => ['view_environment_admin_panel'])
  
     environment.add_admin(person)
     assert person.is_admin?
@@ -80,21 +80,6 @@ class ActiveSupport::TestCase
  
   end
  
-  def self.noosfero_test parameters
-    instance_variable_set('@noosfero_test_extra_parameters', parameters)
-    def extra_parameters
-      @noosfero_test_extra_parameters
-    end
-  end
-
-  def get(path, parameters = nil, headers = nil)
-    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
-  end
-
-  def post(path, parameters = nil, headers = nil)
-    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
-  end
-
   # deprecated on minitest
   def assert_block message=nil
     assert message || 'yield' do
@@ -298,6 +283,21 @@ module NoosferoTestHelper
  
 end
  
+class ActionController::TestCase
+
+  class_attribute :default_params
+  self.default_params = {}
+
+  def get path, parameters = nil, session = nil, flash = nil
+    super path, if parameters then self.default_params.merge parameters else self.default_params end, session, flash
+  end
+
+  def post path, parameters = nil, session = nil, flash = nil
+    super path, if parameters then self.default_params.merge parameters else self.default_params end, session, flash
+  end
+
+end
+
 class ActionController::IntegrationTest
   def assert_can_login
     assert_tag :tag => 'a', :attributes => { :id => 'link_login' }
 require File.join(File.dirname(__FILE__), 'test_helper')
  
-class AccessControlTestController; def rescue_action(e) raise e end; end
 class PermissionCheckTest < ActionController::TestCase
  
   def setup
@@ -12,7 +11,7 @@ class PermissionCheckTest &lt; ActionController::TestCase
   def test_access_denied
     get :index
     assert_response 403
-    assert_template 'access_denied.html'
+    assert_template 'shared/access_denied'
   end
  
   def test_specific_permission_granted
 # Inpired on https://github.com/curtis/honeypot-captcha
-require File.join(File.dirname(__FILE__), 'lib', 'form_tag_helper')
+require_dependency File.join(File.dirname(__FILE__), 'lib', 'form_tag_helper')
  
 module Honeypot
   def honeypot_fields
 module ActionView
   module Helpers
     module FormTagHelper
-      def form_tag_with_honeypot(url_for_options = {}, options = {}, *parameters_for_url, &block)
-        honeypot = options.delete(:honeypot)
-        html = form_tag_without_honeypot(url_for_options, options, *parameters_for_url, &block)
+      def form_tag_with_body_with_honeypot html_options = {}, content
+        honeypot = html_options.delete 'honeypot'
+        html = form_tag_with_body_without_honeypot html_options, content
         if honeypot
-          captcha = "".respond_to?(:html_safe) ? honey_pot_captcha.html_safe : honey_pot_captcha
-          if block_given?
-            html.insert(html.index('</form>'), captcha)
-          else
-            html += captcha
-          end
+          captcha = honey_pot_captcha.html_safe
+          html.insert html.index('</form>'), captcha
         end
         html
       end
-      alias_method_chain :form_tag, :honeypot
+      alias_method_chain :form_tag_with_body, :honeypot
  
     private
...	...	@@ -20,7 +20,7 @@ gem 'exception_notification', '~> 4.0.1'
20	20	gem 'gettext', '~> 2.2.1', :require => false
21	21	gem 'locale', '~> 2.0.5'
22	22	gem 'whenever', :require => false
23		-gem 'eita-jrails', '>= 0.9.8', require: 'jrails'
	23	+gem 'eita-jrails', '>= 0.9.9', require: 'jrails'
24	24
25	25	# asset pipeline
26	26	gem 'uglifier', '>= 1.0.3'
...	...
...	...	@@ -156,7 +156,7 @@ class ApplicationController < ActionController::Base
156	156	def render_not_found(path = nil)
157	157	@no_design_blocks = true
158	158	@path \|\|= request.path
159		- render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
	159	+ render template: 'shared/not_found', status: 404, layout: get_layout
160	160	end
161	161	alias :render_404 :render_not_found
162	162
...	...	@@ -164,7 +164,7 @@ class ApplicationController < ActionController::Base
164	164	@no_design_blocks = true
165	165	@message = message
166	166	@title = title
167		- render :template => 'shared/access_denied.html.erb', :status => 403
	167	+ render template: 'shared/access_denied', status: 403
168	168	end
169	169
170	170	def load_category
...	...
...	...	@@ -113,7 +113,7 @@ class AccountController < ApplicationController
113	113	@user.signup!
114	114	owner_role = Role.find_by_name('owner')
115	115	@user.person.affiliate(@user.person, [owner_role]) if owner_role
116		- invitation = Task.from_code @invitation_code
	116	+ invitation = Task.from_code(@invitation_code).first
117	117	if invitation
118	118	invitation.update_attributes!({:friend => @user.person})
119	119	invitation.finish
...	...	@@ -205,7 +205,7 @@ class AccountController < ApplicationController
205	205	#
206	206	# Posts back.
207	207	def new_password
208		- @change_password = ChangePassword.from_code params[:code]
	208	+ @change_password = ChangePassword.from_code(params[:code]).first
209	209
210	210	unless @change_password
211	211	render :action => 'invalid_change_password_code', :status => 403
...	...	@@ -398,7 +398,7 @@ class AccountController < ApplicationController
398	398	end
399	399
400	400	def load_enterprise_activation
401		- @enterprise_activation \|\|= EnterpriseActivation.from_code params[:enterprise_code]
	401	+ @enterprise_activation \|\|= EnterpriseActivation.from_code(params[:enterprise_code]).first
402	402	end
403	403
404	404	def load_enterprise
...	...
...	...	@@ -67,7 +67,7 @@ class SearchController < PublicController
67	67	end
68	68
69	69	def contents
70		- redirect_to params.merge(:action => :articles)
	70	+ redirect_to url_for(params.merge action: :articles)
71	71	end
72	72
73	73	def people
...	...	@@ -124,7 +124,7 @@ class SearchController < PublicController
124	124	# keep old URLs workings
125	125	def assets
126	126	params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
127		- redirect_to params
	127	+ redirect_to url_for(params)
128	128	end
129	129
130	130	def tags
...	...
...	...	@@ -55,7 +55,7 @@ function check_captcha(button, confirm_action) {
55	55	<div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %>">
56	56
57	57	<%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link && @comment.reply_of_id.blank? %>
58		-<%= remote_form_for(:comment, @comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ? @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do \|f\| %>
	58	+<%= remote_form_for(@comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ? @comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do \|f\| %>
59	59
60	60	<%= required_fields_message %>
61	61
...	...
...	...	@@ -2,7 +2,7 @@
2	2
3	3	<div id='request_result_message' style='display: none'></div>
4	4
5		-<%= remote_form_for :product, @product,
	5	+<%= remote_form_for @product,
6	6	:loading => "open_loading('#{ _('loading...') }')",
7	7	:update => "request_result_message",
8	8	:url => {:action => 'new'},
...	...
...	...	@@ -1,15 +0,0 @@
1		-<div id='search-content'>
2		- <% if @results %>
3		- <div class='results-found-message'>
4		- <%= _("%s results found") % @results.total_entries %>
5		- </div>
6		-
7		- <ul class='results-list'>
8		- <% @results.sort_by { \|r\| r.is_image? ? 0 : 1}.each do \|result\| %>
9		- <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
10		- <% end %>
11		- </ul>
12		-
13		- <%= pagination_links @results %>
14		- <% end %>
15		-</div>
...	...	@@ -0,0 +1,15 @@
	1	+<div id='search-content'>
	2	+ <% if @results %>
	3	+ <div class='results-found-message'>
	4	+ <%= _("%s results found") % @results.total_entries %>
	5	+ </div>
	6	+
	7	+ <ul class='results-list'>
	8	+ <% @results.sort_by { \|r\| r.is_image? ? 0 : 1}.each do \|result\| %>
	9	+ <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
	10	+ <% end %>
	11	+ </ul>
	12	+
	13	+ <%= pagination_links @results %>
	14	+ <% end %>
	15	+</div>
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	<%= render :partial => 'shared/profile_search_form' %>
5	5
6		- <%= render :partial => 'results-list' %>
	6	+ <%= render 'results_list' %>
7	7
8	8	</div>
9	9	<%= javascript_include_tag 'search' %>
...	...
1		-jQuery('#search-content').html('<%= escape_javascript(render :partial => "results-list") %>');
	1	+jQuery('#search-content').html('<%= j render 'results_list' %>');
...	...