Download as
Browse Code »

Commit 0fc18e7c94fea541299e269a7d40d5afea8a20dc

Authored by Weblate
2 parents 04fc5678 9928c540
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

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 18 additions and 7 deletions   Show diff stats
plugins/people_block/test/functional/people_block_plugin_profile_controller_test.rb
  Diff comments   View file @0fc18e7
1   -require File.dirname(__FILE__) + '/../test_helper'
2   -require File.dirname(__FILE__) + '/../../controllers/people_block_plugin_profile_controller'
  1 +require_relative '../test_helper'
  2 +require_relative '../../controllers/people_block_plugin_profile_controller'
3 3  
4 4  
5 5 # Re-raise errors caught by the controller.
... ...
plugins/people_block/test/unit/friends_block_test.rb
  Diff comments   View file @0fc18e7
1   -require File.dirname(__FILE__) + '/../test_helper'
  1 +require_relative '../test_helper'
2 2  
3 3 class FriendsBlockTest < ActionView::TestCase
4 4  
... ...
test/test_helper.rb
  Diff comments   View file @0fc18e7
... ... @@ -154,6 +154,21 @@ class ActiveSupport::TestCase
154 154 self.class.action_view.render(*args)
155 155 end
156 156  
  157 + def url_for args = {}
  158 + args
  159 + end
  160 +
  161 + # url_for inside views (partials)
  162 + # from http://stackoverflow.com/a/13704257/670229
  163 + ActionView::TestCase::TestController.instance_eval do
  164 + helper Noosfero::Application.routes.url_helpers
  165 + end
  166 + ActionView::TestCase::TestController.class_eval do
  167 + def _routes
  168 + Noosfero::Application.routes
  169 + end
  170 + end
  171 +
157 172 private
158 173  
159 174 def uses_host(name)
... ... @@ -234,10 +249,6 @@ module NoosferoTestHelper
234 249 def will_paginate(arg1, arg2)
235 250 end
236 251  
237   - def url_for(args = {})
238   - args
239   - end
240   -
241 252 def javascript_tag(any)
242 253 ''
243 254 end
... ...