Download as
Browse Code »

Commit c9fefc28ee0a5f278b3f11e4b72b78364ee93c5f

Authored by Braulio Bhavamitra
1 parent 5e5f1478
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix unitinialized constant Test

Showing 3 changed files with 16 additions and 25 deletions   Show diff stats
config/application.rb
  Diff comments   View file @c9fefc2
... ... @@ -29,7 +29,7 @@ module Noosfero
29 29  
30 30 # Custom directories with classes and modules you want to be autoloadable.
31 31 config.autoload_paths += %W( #{Rails.root.join('app', 'sweepers')} )
32   - config.autoload_paths += Dir["#{config.root}/lib/**/"]
  32 + config.autoload_paths += Dir["#{config.root}/lib"]
33 33 config.autoload_paths += Dir["#{config.root}/app/controllers/**/"]
34 34 config.autoload_paths += %W( #{Rails.root.join('test', 'mocks', Rails.env)} )
35 35  
... ...
lib/noosfero/test.rb
View file @5e5f147
... ... @@ -1,23 +0,0 @@
1   -module Noosfero::Test
2   -
3   - def get(path, parameters = nil, headers = nil)
4   - super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
5   - end
6   -
7   - def post(path, parameters = nil, headers = nil)
8   - super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
9   - end
10   -
11   - module ClassMethods
12   - def noosfero_test(parameters)
13   - instance_variable_set('@noosfero_test_extra_parameters', parameters)
14   - def extra_parameters
15   - @noosfero_test_extra_parameters
16   - end
17   - include Noosfero::Test
18   - end
19   - end
20   -
21   -end
22   -
23   -Test::Unit::TestCase.send(:extend, Noosfero::Test::ClassMethods)
test/test_helper.rb
  Diff comments   View file @c9fefc2
... ... @@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
4 4 require 'rails/test_help'
5 5 require 'mocha'
6 6  
7   -require 'noosfero/test'
8 7 require 'authenticated_test_helper'
9 8 require File.dirname(__FILE__) + '/factories'
10 9 require File.dirname(__FILE__) + '/noosfero_doc_test'
... ... @@ -76,6 +75,21 @@ class ActiveSupport::TestCase
76 75  
77 76 end
78 77  
  78 + def self.noosfero_test parameters
  79 + instance_variable_set('@noosfero_test_extra_parameters', parameters)
  80 + def extra_parameters
  81 + @noosfero_test_extra_parameters
  82 + end
  83 + end
  84 +
  85 + def get(path, parameters = nil, headers = nil)
  86 + super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
  87 + end
  88 +
  89 + def post(path, parameters = nil, headers = nil)
  90 + super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
  91 + end
  92 +
79 93 alias :ok :assert_block
80 94  
81 95 def assert_equivalent(enum1, enum2)
... ...