From c5ab3491c1c4d515d43bc716ebe8eef90a5cf651 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Fri, 22 Feb 2008 23:06:18 +0000 Subject: [PATCH] ActionItem172: moving NoosfetoTest module into Noosfero::Test, since it conflicts with NoosferoTest testcase class --- lib/noosfero/test.rb | 6 +++--- test/test_helper.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/noosfero/test.rb b/lib/noosfero/test.rb index 6f5853c..f166d7d 100644 --- a/lib/noosfero/test.rb +++ b/lib/noosfero/test.rb @@ -1,4 +1,4 @@ -module NoosferoTest +module Noosfero::Test def get(path, parameters = nil, headers = nil) super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers) @@ -14,10 +14,10 @@ module NoosferoTest def extra_parameters @noosfero_test_extra_parameters end - include NoosferoTest + include Noosfero::Test end end end -Test::Unit::TestCase.send(:extend, NoosferoTest::ClassMethods) +Test::Unit::TestCase.send(:extend, Noosfero::Test::ClassMethods) diff --git a/test/test_helper.rb b/test/test_helper.rb index 7d2ecd6..ecaa436 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' require 'mocha' -require 'noosfero_test' + +require 'noosfero/test' class Test::Unit::TestCase # Transactional fixtures accelerate your tests by wrapping each test method -- libgit2 0.21.2