Download as
Browse Code »

Commit c18744666c8d5e233ae74a6fdd91ca35cf48d560

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

Small after-merge fixes 

* A wrong 'browse' route (replaced with 'search')
* Lack of an 'expect' on the CmsControllerTest
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/views/account/signup.rhtml
  Diff comments   View file @c187446
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <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> 10 <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>
11 <p>Learn the guidelines. Read the <a href=\"/doc\" target=\"_blank\">Documentation</a> for more details on how to use new social network!</p> 11 <p>Learn the guidelines. Read the <a href=\"/doc\" target=\"_blank\">Documentation</a> for more details on how to use new social network!</p>
12 <p><a href=\"/doc/user/invite-contacts\" target=\"_blank\">Invite and find</a> your Gmail, Yahoo and Hotmail contacts!</p> 12 <p><a href=\"/doc/user/invite-contacts\" target=\"_blank\">Invite and find</a> your Gmail, Yahoo and Hotmail contacts!</p>
13 - <p>Start exploring and Have fun!</p>" % [environment.name, url_for(:controller => :browse, :action => :people, :filter => 'more_recent')]) %> 13 + <p>Start exploring and Have fun!</p>" % [environment.name, url_for(:controller => :search, :action => :people, :filter => 'more_recent')]) %>
14 </div> 14 </div>
15 <% else %> 15 <% else %>
16 <h1><%= _('Sign up for %s!') % environment.name %></h1> 16 <h1><%= _('Sign up for %s!') % environment.name %></h1>
test/functional/cms_controller_test.rb
  Diff comments   View file @c187446
@@ -1520,6 +1520,7 @@ class CmsControllerTest &lt; ActionController::TestCase @@ -1520,6 +1520,7 @@ class CmsControllerTest &lt; ActionController::TestCase
1520 plugins.stubs(:map).with(:head_ending).returns([]) 1520 plugins.stubs(:map).with(:head_ending).returns([])
1521 plugins.stubs(:enabled_plugins).returns([]) 1521 plugins.stubs(:enabled_plugins).returns([])
1522 1522
  1523 + Noosfero::Plugin::Manager.expects(:new).with(@controller).returns(plugins)
1523 get :index, :profile => profile.identifier 1524 get :index, :profile => profile.identifier
1524 1525
1525 assert_includes @controller.special_article_types, Integer 1526 assert_includes @controller.special_article_types, Integer