From c18744666c8d5e233ae74a6fdd91ca35cf48d560 Mon Sep 17 00:00:00 2001
From: Rafael Martins <rmmartins@gmail.com>
Date: Mon, 20 Feb 2012 02:16:42 -0200
Subject: [PATCH] Small after-merge fixes

---
 app/views/account/signup.rhtml         | 2 +-
 test/functional/cms_controller_test.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/account/signup.rhtml b/app/views/account/signup.rhtml
index a0b9ef9..c00b8dd 100644
--- a/app/views/account/signup.rhtml
+++ b/app/views/account/signup.rhtml
@@ -10,7 +10,7 @@
          <p><a href=\"/doc/user/editing-person-info\" target=\"_blank\">Customize your profile</a>. Upload an avatar and let your friends find you easily :)</p>
          <p>Learn the guidelines. Read the <a href=\"/doc\" target=\"_blank\">Documentation</a> for more details on how to use new social network!</p>
          <p><a href=\"/doc/user/invite-contacts\" target=\"_blank\">Invite and find</a> your Gmail, Yahoo and Hotmail contacts!</p>
-         <p>Start exploring and Have fun!</p>" % [environment.name, url_for(:controller => :browse, :action => :people, :filter => 'more_recent')]) %>
+         <p>Start exploring and Have fun!</p>" % [environment.name, url_for(:controller => :search, :action => :people, :filter => 'more_recent')]) %>
 </div>
 <% else %>
   <h1><%= _('Sign up for %s!') % environment.name %></h1>
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 261dffe..77f081d 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1520,6 +1520,7 @@ class CmsControllerTest < ActionController::TestCase
     plugins.stubs(:map).with(:head_ending).returns([])
     plugins.stubs(:enabled_plugins).returns([])
 
+    Noosfero::Plugin::Manager.expects(:new).with(@controller).returns(plugins)
     get :index, :profile => profile.identifier
 
     assert_includes @controller.special_article_types, Integer
--
libgit2 0.21.2