From 1d97315c624cbe2d72a3677bf1cd2bd8377e54ed Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 17 Jul 2010 11:17:45 -0300 Subject: [PATCH] checkpoint --- test/test_helper.rb | 2 +- test/unit/acts_as_filesystem_test.rb | 2 +- test/unit/acts_as_having_boxes_test.rb | 2 +- test/unit/acts_as_having_settings_test.rb | 2 +- test/unit/application_helper_test.rb | 2 +- test/unit/article_block_test.rb | 2 +- test/unit/article_categorization_test.rb | 2 +- test/unit/article_test.rb | 2 +- test/unit/assets_helper_test.rb | 2 +- test/unit/block_test.rb | 2 +- test/unit/blog_helper_test.rb | 2 +- test/unit/boxes_helper_test.rb | 2 +- test/unit/categories_helper_test.rb | 2 +- test/unit/category_test.rb | 2 +- test/unit/change_password_test.rb | 2 +- test/unit/cms_helper_test.rb | 2 +- test/unit/comment_notifier_test.rb | 2 +- test/unit/comment_test.rb | 2 +- test/unit/communities_block_test.rb | 2 +- test/unit/community_test.rb | 2 +- test/unit/consumption_test.rb | 2 +- test/unit/contact_sender_test.rb | 2 +- test/unit/content_viewer_helper_test.rb | 2 +- test/unit/countries_helper_test.rb | 2 +- test/unit/create_community_test.rb | 2 +- test/unit/create_enterprise_test.rb | 2 +- test/unit/dates_helper_test.rb | 2 +- test/unit/disabled_enterprise_message_block_test.rb | 2 +- test/unit/domain_test.rb | 2 +- test/unit/email_activation_test.rb | 2 +- test/unit/enterprise_homepage_test.rb | 2 +- test/unit/enterprise_test.rb | 2 +- test/unit/enterprises_block_test.rb | 2 +- test/unit/environment_statistics_block_test.rb | 2 +- test/unit/environment_test.rb | 2 +- test/unit/events_helper_test.rb | 2 +- test/unit/extended_tag_test.rb | 2 +- test/unit/feed_handler_test.rb | 2 +- test/unit/feed_updater_test.rb | 2 +- test/unit/feed_writer_test.rb | 2 +- test/unit/folder_helper_test.rb | 2 +- test/unit/forms_helper_test.rb | 2 +- test/unit/friendship_test.rb | 2 +- test/unit/google_maps_test.rb | 2 +- test/unit/image_gallery_test.rb | 2 +- test/unit/image_test.rb | 2 +- test/unit/integer_core_ext_test.rb | 2 +- test/unit/language_helper_test.rb | 2 +- test/unit/lightbox_helper_test.rb | 2 +- test/unit/location_block_test.rb | 2 +- test/unit/login_block_test.rb | 2 +- test/unit/main_block_test.rb | 2 +- test/unit/members_block_test.rb | 2 +- test/unit/noosfero_test.rb | 2 +- test/unit/organization_test.rb | 2 +- test/unit/pending_task_notifier_test.rb | 2 +- test/unit/person_test.rb | 2 +- test/unit/product_category_test.rb | 2 +- test/unit/product_test.rb | 2 +- test/unit/profile_helper_test.rb | 2 +- test/unit/profile_image_block_test.rb | 2 +- test/unit/profile_info_block_test.rb | 2 +- test/unit/profile_list_block_test.rb | 2 +- test/unit/profile_test.rb | 2 +- test/unit/recent_documents_block_test.rb | 2 +- test/unit/region_test.rb | 2 +- test/unit/rss_feed_test.rb | 2 +- test/unit/search_helper_test.rb | 2 +- test/unit/slug_test.rb | 2 +- test/unit/sqlite_extension_test.rb | 2 +- test/unit/string_core_ext_test.rb | 2 +- test/unit/tags_block_test.rb | 2 +- test/unit/task_mailer_test.rb | 2 +- test/unit/task_test.rb | 2 +- test/unit/text_article_test.rb | 2 +- test/unit/textile_article_test.rb | 2 +- test/unit/thickbox_helper_test.rb | 2 +- test/unit/thumbnail_test.rb | 2 +- test/unit/tiny_mce_article_test.rb | 2 +- test/unit/uploaded_file_test.rb | 2 +- test/unit/user_mailer_test.rb | 2 +- test/unit/user_test.rb | 2 +- test/unit/validation_info_test.rb | 2 +- vendor/plugins/xss_terminate/lib/xss_terminate.rb | 4 ++-- 84 files changed, 85 insertions(+), 85 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 5c641c1..bcee117 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -14,7 +14,7 @@ FileUtils.rm_rf(File.join(RAILS_ROOT, 'index', 'test')) Image.attachment_options[:path_prefix] = 'test/tmp/public/images' Thumbnail.attachment_options[:path_prefix] = 'test/tmp/public/thumbnails' -class Test::Unit::TestCase +class ActiveSupport::TestCase # Transactional fixtures accelerate your tests by wrapping each test method # in a transaction that's rolled back on completion. This ensures that the # test database remains unchanged so your fixtures don't have to be reloaded diff --git a/test/unit/acts_as_filesystem_test.rb b/test/unit/acts_as_filesystem_test.rb index 2e7a2f9..ffd3f4c 100644 --- a/test/unit/acts_as_filesystem_test.rb +++ b/test/unit/acts_as_filesystem_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ActsAsFilesystemTest < Test::Unit::TestCase +class ActsAsFilesystemTest < ActiveSupport::TestCase # FIXME shouldn't we test with a non-real model, instead of Article? diff --git a/test/unit/acts_as_having_boxes_test.rb b/test/unit/acts_as_having_boxes_test.rb index e9138a4..71ba4de 100644 --- a/test/unit/acts_as_having_boxes_test.rb +++ b/test/unit/acts_as_having_boxes_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ActsAsHavingBoxesTest < Test::Unit::TestCase +class ActsAsHavingBoxesTest < ActiveSupport::TestCase should 'be able to find blocks by id' do env = fast_create(Environment, :name => 'An environment without blocks') diff --git a/test/unit/acts_as_having_settings_test.rb b/test/unit/acts_as_having_settings_test.rb index 696c394..570e408 100644 --- a/test/unit/acts_as_having_settings_test.rb +++ b/test/unit/acts_as_having_settings_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ActsAsHavingSettingsTest < Test::Unit::TestCase +class ActsAsHavingSettingsTest < ActiveSupport::TestCase # using Block class as a sample user of the module class TestClass < Block diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index 4c48093..860ffb0 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ApplicationHelperTest < Test::Unit::TestCase +class ApplicationHelperTest < ActiveSupport::TestCase include ApplicationHelper diff --git a/test/unit/article_block_test.rb b/test/unit/article_block_test.rb index bb24c54..434d353 100644 --- a/test/unit/article_block_test.rb +++ b/test/unit/article_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ArticleBlockTest < Test::Unit::TestCase +class ArticleBlockTest < ActiveSupport::TestCase include ApplicationHelper diff --git a/test/unit/article_categorization_test.rb b/test/unit/article_categorization_test.rb index a92bb24..78dd9d6 100644 --- a/test/unit/article_categorization_test.rb +++ b/test/unit/article_categorization_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ArticleCategorizationTest < Test::Unit::TestCase +class ArticleCategorizationTest < ActiveSupport::TestCase should 'use articles_categories table' do assert_equal 'articles_categories', ArticleCategorization.table_name diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 9667090..a243c3e 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ArticleTest < Test::Unit::TestCase +class ArticleTest < ActiveSupport::TestCase fixtures :environments diff --git a/test/unit/assets_helper_test.rb b/test/unit/assets_helper_test.rb index a60ba37..41c6eed 100644 --- a/test/unit/assets_helper_test.rb +++ b/test/unit/assets_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class AssetsHelperTest < Test::Unit::TestCase +class AssetsHelperTest < ActiveSupport::TestCase include AssetsHelper diff --git a/test/unit/block_test.rb b/test/unit/block_test.rb index 2c40972..b5e5773 100644 --- a/test/unit/block_test.rb +++ b/test/unit/block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class BlockTest < Test::Unit::TestCase +class BlockTest < ActiveSupport::TestCase should 'describe itself' do assert_kind_of String, Block.description diff --git a/test/unit/blog_helper_test.rb b/test/unit/blog_helper_test.rb index 4cbbf66..f5e5db6 100644 --- a/test/unit/blog_helper_test.rb +++ b/test/unit/blog_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class BlogHelperTest < Test::Unit::TestCase +class BlogHelperTest < ActiveSupport::TestCase include BlogHelper include ContentViewerHelper diff --git a/test/unit/boxes_helper_test.rb b/test/unit/boxes_helper_test.rb index 67805b8..71e59da 100644 --- a/test/unit/boxes_helper_test.rb +++ b/test/unit/boxes_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class BoxesHelperTest < Test::Unit::TestCase +class BoxesHelperTest < ActiveSupport::TestCase include BoxesHelper include ActionView::Helpers::TagHelper diff --git a/test/unit/categories_helper_test.rb b/test/unit/categories_helper_test.rb index cb62749..a141721 100644 --- a/test/unit/categories_helper_test.rb +++ b/test/unit/categories_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CategoriesHelperTest < Test::Unit::TestCase +class CategoriesHelperTest < ActiveSupport::TestCase include CategoriesHelper diff --git a/test/unit/category_test.rb b/test/unit/category_test.rb index 1127a40..ee1f2a5 100644 --- a/test/unit/category_test.rb +++ b/test/unit/category_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' # FIXME move the filesystem-related tests out here -class CategoryTest < Test::Unit::TestCase +class CategoryTest < ActiveSupport::TestCase def setup @env = fast_create(Environment) diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb index e858ea2..cfebf62 100644 --- a/test/unit/change_password_test.rb +++ b/test/unit/change_password_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ChangePasswordTest < Test::Unit::TestCase +class ChangePasswordTest < ActiveSupport::TestCase fixtures :environments diff --git a/test/unit/cms_helper_test.rb b/test/unit/cms_helper_test.rb index 162c658..f2bb80c 100644 --- a/test/unit/cms_helper_test.rb +++ b/test/unit/cms_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CmsHelperTest < Test::Unit::TestCase +class CmsHelperTest < ActiveSupport::TestCase include CmsHelper include BlogHelper diff --git a/test/unit/comment_notifier_test.rb b/test/unit/comment_notifier_test.rb index 1327d1e..6db4e4b 100644 --- a/test/unit/comment_notifier_test.rb +++ b/test/unit/comment_notifier_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CommentNotifierTest < Test::Unit::TestCase +class CommentNotifierTest < ActiveSupport::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb index 43708a5..00da5ec 100644 --- a/test/unit/comment_test.rb +++ b/test/unit/comment_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CommentTest < Test::Unit::TestCase +class CommentTest < ActiveSupport::TestCase should 'have a name and require it' do assert_mandatory(Comment.new, :title) diff --git a/test/unit/communities_block_test.rb b/test/unit/communities_block_test.rb index a4cc7db..91982cb 100644 --- a/test/unit/communities_block_test.rb +++ b/test/unit/communities_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CommunitiesBlockTest < Test::Unit::TestCase +class CommunitiesBlockTest < ActiveSupport::TestCase should 'inherit from ProfileListBlock' do assert_kind_of ProfileListBlock, CommunitiesBlock.new diff --git a/test/unit/community_test.rb b/test/unit/community_test.rb index a6de20f..2e69dd6 100644 --- a/test/unit/community_test.rb +++ b/test/unit/community_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CommunityTest < Test::Unit::TestCase +class CommunityTest < ActiveSupport::TestCase def setup @person = create_user('testuser').person diff --git a/test/unit/consumption_test.rb b/test/unit/consumption_test.rb index 34b42e0..3c447ae 100644 --- a/test/unit/consumption_test.rb +++ b/test/unit/consumption_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ConsumptionTest < Test::Unit::TestCase +class ConsumptionTest < ActiveSupport::TestCase fixtures :consumptions should 'escape malformed html tags' do diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb index ff1a711..99e7daa 100644 --- a/test/unit/contact_sender_test.rb +++ b/test/unit/contact_sender_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ContactSenderTest < Test::Unit::TestCase +class ContactSenderTest < ActiveSupport::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" diff --git a/test/unit/content_viewer_helper_test.rb b/test/unit/content_viewer_helper_test.rb index b04d27e..99f1df8 100644 --- a/test/unit/content_viewer_helper_test.rb +++ b/test/unit/content_viewer_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ContentViewerHelperTest < Test::Unit::TestCase +class ContentViewerHelperTest < ActiveSupport::TestCase include ActionView::Helpers::TagHelper include ContentViewerHelper diff --git a/test/unit/countries_helper_test.rb b/test/unit/countries_helper_test.rb index 63f723b..9d65b72 100644 --- a/test/unit/countries_helper_test.rb +++ b/test/unit/countries_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CountriesHelperTest < Test::Unit::TestCase +class CountriesHelperTest < ActiveSupport::TestCase def setup @helper = CountriesHelper.instance diff --git a/test/unit/create_community_test.rb b/test/unit/create_community_test.rb index ec2e433..4baa4e9 100644 --- a/test/unit/create_community_test.rb +++ b/test/unit/create_community_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CreateCommunityTest < Test::Unit::TestCase +class CreateCommunityTest < ActiveSupport::TestCase def setup @person = create_user('testing').person diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb index ff07a25..705076f 100644 --- a/test/unit/create_enterprise_test.rb +++ b/test/unit/create_enterprise_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class CreateEnterpriseTest < Test::Unit::TestCase +class CreateEnterpriseTest < ActiveSupport::TestCase should 'provide needed data' do task = CreateEnterprise.new diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb index 2644241..554146c 100644 --- a/test/unit/dates_helper_test.rb +++ b/test/unit/dates_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class DatesHelperTest < Test::Unit::TestCase +class DatesHelperTest < ActiveSupport::TestCase include DatesHelper diff --git a/test/unit/disabled_enterprise_message_block_test.rb b/test/unit/disabled_enterprise_message_block_test.rb index 98ef277..7d3a35c 100644 --- a/test/unit/disabled_enterprise_message_block_test.rb +++ b/test/unit/disabled_enterprise_message_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class DisabledEnterpriseMessageBlockTest < Test::Unit::TestCase +class DisabledEnterpriseMessageBlockTest < ActiveSupport::TestCase should 'provide description' do assert_not_equal Block.description, DisabledEnterpriseMessageBlock.description diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb index be2598c..928aa7c 100644 --- a/test/unit/domain_test.rb +++ b/test/unit/domain_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class DomainTest < Test::Unit::TestCase +class DomainTest < ActiveSupport::TestCase fixtures :domains, :environments, :profiles, :users def setup diff --git a/test/unit/email_activation_test.rb b/test/unit/email_activation_test.rb index ba15261..92e6450 100644 --- a/test/unit/email_activation_test.rb +++ b/test/unit/email_activation_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EmailActivationTest < Test::Unit::TestCase +class EmailActivationTest < ActiveSupport::TestCase def setup ActionMailer::Base.delivery_method = :test diff --git a/test/unit/enterprise_homepage_test.rb b/test/unit/enterprise_homepage_test.rb index fd7fb32..c5e371c 100644 --- a/test/unit/enterprise_homepage_test.rb +++ b/test/unit/enterprise_homepage_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EnterpriseHomepageTest < Test::Unit::TestCase +class EnterpriseHomepageTest < ActiveSupport::TestCase def setup @profile = create_user('testing').person diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb index b348cee..51d4191 100644 --- a/test/unit/enterprise_test.rb +++ b/test/unit/enterprise_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EnterpriseTest < Test::Unit::TestCase +class EnterpriseTest < ActiveSupport::TestCase fixtures :profiles, :environments, :users def test_identifier_validation diff --git a/test/unit/enterprises_block_test.rb b/test/unit/enterprises_block_test.rb index 06e297f..9a962d2 100644 --- a/test/unit/enterprises_block_test.rb +++ b/test/unit/enterprises_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EnterprisesBlockTest < Test::Unit::TestCase +class EnterprisesBlockTest < ActiveSupport::TestCase should 'inherit from ProfileListBlock' do assert_kind_of ProfileListBlock, EnterprisesBlock.new diff --git a/test/unit/environment_statistics_block_test.rb b/test/unit/environment_statistics_block_test.rb index 9c49830..075dac0 100644 --- a/test/unit/environment_statistics_block_test.rb +++ b/test/unit/environment_statistics_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EnvironmentStatisticsBlockTest < Test::Unit::TestCase +class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase should 'inherit from Block' do assert_kind_of Block, EnvironmentStatisticsBlock.new diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb index 46f37c4..7edde56 100644 --- a/test/unit/environment_test.rb +++ b/test/unit/environment_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EnvironmentTest < Test::Unit::TestCase +class EnvironmentTest < ActiveSupport::TestCase fixtures :environments def test_exists_default_and_it_is_unique diff --git a/test/unit/events_helper_test.rb b/test/unit/events_helper_test.rb index e9f06b0..56b39e1 100644 --- a/test/unit/events_helper_test.rb +++ b/test/unit/events_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class EventsHelperTest < Test::Unit::TestCase +class EventsHelperTest < ActiveSupport::TestCase include EventsHelper diff --git a/test/unit/extended_tag_test.rb b/test/unit/extended_tag_test.rb index 25577e8..9faf42c 100644 --- a/test/unit/extended_tag_test.rb +++ b/test/unit/extended_tag_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' require 'extended_tag.rb' -class UserTest < Test::Unit::TestCase +class UserTest < ActiveSupport::TestCase def test_find_without_pendings tag1 = Tag.create(:name => 'pending_tag', :pending => true) diff --git a/test/unit/feed_handler_test.rb b/test/unit/feed_handler_test.rb index 964f7e6..920efbc 100644 --- a/test/unit/feed_handler_test.rb +++ b/test/unit/feed_handler_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FeedHandlerTest < Test::Unit::TestCase +class FeedHandlerTest < ActiveSupport::TestCase def setup @handler = FeedHandler.new diff --git a/test/unit/feed_updater_test.rb b/test/unit/feed_updater_test.rb index c764aa0..38bfb2d 100644 --- a/test/unit/feed_updater_test.rb +++ b/test/unit/feed_updater_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FeedUpdaterTest < Test::Unit::TestCase +class FeedUpdaterTest < ActiveSupport::TestCase should 'be running by default' do assert_equal true, FeedUpdater.new.running diff --git a/test/unit/feed_writer_test.rb b/test/unit/feed_writer_test.rb index 6d72558..13dfb7b 100644 --- a/test/unit/feed_writer_test.rb +++ b/test/unit/feed_writer_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FeedWriterTest < Test::Unit::TestCase +class FeedWriterTest < ActiveSupport::TestCase should 'generate feeds' do articles = [] diff --git a/test/unit/folder_helper_test.rb b/test/unit/folder_helper_test.rb index fa767f5..11e0bd4 100644 --- a/test/unit/folder_helper_test.rb +++ b/test/unit/folder_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FolderHelperTest < Test::Unit::TestCase +class FolderHelperTest < ActiveSupport::TestCase include ActionView::Helpers::TagHelper include ActionView::Helpers::UrlHelper diff --git a/test/unit/forms_helper_test.rb b/test/unit/forms_helper_test.rb index ee4c323..5306a44 100644 --- a/test/unit/forms_helper_test.rb +++ b/test/unit/forms_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FormsHelperTest < Test::Unit::TestCase +class FormsHelperTest < ActiveSupport::TestCase include FormsHelper include ActionView::Helpers::TagHelper diff --git a/test/unit/friendship_test.rb b/test/unit/friendship_test.rb index 5365cac..d070abd 100644 --- a/test/unit/friendship_test.rb +++ b/test/unit/friendship_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class FriendshipTest < Test::Unit::TestCase +class FriendshipTest < ActiveSupport::TestCase should 'connect a person to another' do p1 = create_user('person_test').person diff --git a/test/unit/google_maps_test.rb b/test/unit/google_maps_test.rb index fb57401..7034431 100644 --- a/test/unit/google_maps_test.rb +++ b/test/unit/google_maps_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class GoogleMapsTest < Test::Unit::TestCase +class GoogleMapsTest < ActiveSupport::TestCase def setup @domain = fast_create(Domain, :name => 'example-domain', :google_maps_key => 'DOMAIN_KEY') diff --git a/test/unit/image_gallery_test.rb b/test/unit/image_gallery_test.rb index 05cad00..cb15c7f 100644 --- a/test/unit/image_gallery_test.rb +++ b/test/unit/image_gallery_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ImageGalleryTest < Test::Unit::TestCase +class ImageGalleryTest < ActiveSupport::TestCase should 'be a type of article' do assert_kind_of Article, ImageGallery.new diff --git a/test/unit/image_test.rb b/test/unit/image_test.rb index 9f1838d..dd25fbd 100644 --- a/test/unit/image_test.rb +++ b/test/unit/image_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ImageTest < Test::Unit::TestCase +class ImageTest < ActiveSupport::TestCase fixtures :images should 'have thumbnails options' do diff --git a/test/unit/integer_core_ext_test.rb b/test/unit/integer_core_ext_test.rb index 12535c0..5b308f1 100644 --- a/test/unit/integer_core_ext_test.rb +++ b/test/unit/integer_core_ext_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' # tests for Integer core extension. See lib/noosfero/core_ext/integer.rb -class IntegerCoreExtTest < Test::Unit::TestCase +class IntegerCoreExtTest < ActiveSupport::TestCase should 'display bytes in human readable' do assert_equal '2 bytes', 2.bytes.to_humanreadable diff --git a/test/unit/language_helper_test.rb b/test/unit/language_helper_test.rb index 11a7c8e..7e02aa9 100644 --- a/test/unit/language_helper_test.rb +++ b/test/unit/language_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class LanguageHelperTest < Test::Unit::TestCase +class LanguageHelperTest < ActiveSupport::TestCase include LanguageHelper diff --git a/test/unit/lightbox_helper_test.rb b/test/unit/lightbox_helper_test.rb index 67e2820..d009107 100644 --- a/test/unit/lightbox_helper_test.rb +++ b/test/unit/lightbox_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class LightboxHelperTest < Test::Unit::TestCase +class LightboxHelperTest < ActiveSupport::TestCase include LightboxHelper diff --git a/test/unit/location_block_test.rb b/test/unit/location_block_test.rb index e8f810c..f06f65a 100644 --- a/test/unit/location_block_test.rb +++ b/test/unit/location_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class LocationBlockTest < Test::Unit::TestCase +class LocationBlockTest < ActiveSupport::TestCase def setup @profile = create_user('lele').person diff --git a/test/unit/login_block_test.rb b/test/unit/login_block_test.rb index 43cdd1a..83d663e 100644 --- a/test/unit/login_block_test.rb +++ b/test/unit/login_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class LoginBlockTest < Test::Unit::TestCase +class LoginBlockTest < ActiveSupport::TestCase def setup @block = LoginBlock.new diff --git a/test/unit/main_block_test.rb b/test/unit/main_block_test.rb index c700d09..69ff681 100644 --- a/test/unit/main_block_test.rb +++ b/test/unit/main_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class MainBlockTest < Test::Unit::TestCase +class MainBlockTest < ActiveSupport::TestCase should 'describe itself' do assert_kind_of String, MainBlock.description diff --git a/test/unit/members_block_test.rb b/test/unit/members_block_test.rb index 4ae2647..4927f74 100644 --- a/test/unit/members_block_test.rb +++ b/test/unit/members_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class MembersBlockTest < Test::Unit::TestCase +class MembersBlockTest < ActiveSupport::TestCase should 'inherit from ProfileListBlock' do assert_kind_of ProfileListBlock, MembersBlock.new diff --git a/test/unit/noosfero_test.rb b/test/unit/noosfero_test.rb index 1987ff3..8a23697 100644 --- a/test/unit/noosfero_test.rb +++ b/test/unit/noosfero_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' require 'noosfero' -class NoosferoTest < Test::Unit::TestCase +class NoosferoTest < ActiveSupport::TestCase def test_should_list_controllers_in_directory Dir.expects(:glob).with("#{RAILS_ROOT}/app/controllers/lala/*_controller.rb").returns(["app/controllers/lala/system_admin_controller.rb", "app/controllers/lala/environment_admin_controller.rb", "app/controllers/lala/public_controller.rb", "app/controllers/lala/profile_admin_controller.rb"]).once diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb index c5ef7aa..13d4603 100644 --- a/test/unit/organization_test.rb +++ b/test/unit/organization_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class OrganizationTest < Test::Unit::TestCase +class OrganizationTest < ActiveSupport::TestCase fixtures :profiles def create_create_enterprise(org) diff --git a/test/unit/pending_task_notifier_test.rb b/test/unit/pending_task_notifier_test.rb index ec56c3b..77a3a3f 100644 --- a/test/unit/pending_task_notifier_test.rb +++ b/test/unit/pending_task_notifier_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class PendingTaskNotifierTest < Test::Unit::TestCase +class PendingTaskNotifierTest < ActiveSupport::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb index 7aebcf3..225ff01 100644 --- a/test/unit/person_test.rb +++ b/test/unit/person_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class PersonTest < Test::Unit::TestCase +class PersonTest < ActiveSupport::TestCase fixtures :profiles, :users, :environments def test_person_must_come_form_the_cration_of_an_user diff --git a/test/unit/product_category_test.rb b/test/unit/product_category_test.rb index 7dd1ad9..84a67db 100644 --- a/test/unit/product_category_test.rb +++ b/test/unit/product_category_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProductCategoryTest < Test::Unit::TestCase +class ProductCategoryTest < ActiveSupport::TestCase def test_all_products c0 = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default) diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb index fe71ec0..8f80ea4 100644 --- a/test/unit/product_test.rb +++ b/test/unit/product_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProductTest < Test::Unit::TestCase +class ProductTest < ActiveSupport::TestCase should 'create product' do assert_difference Product, :count do diff --git a/test/unit/profile_helper_test.rb b/test/unit/profile_helper_test.rb index 31902e1..65af3ac 100644 --- a/test/unit/profile_helper_test.rb +++ b/test/unit/profile_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProfileHelperTest < Test::Unit::TestCase +class ProfileHelperTest < ActiveSupport::TestCase def setup @profile = mock diff --git a/test/unit/profile_image_block_test.rb b/test/unit/profile_image_block_test.rb index ed19b87..ad8f175 100644 --- a/test/unit/profile_image_block_test.rb +++ b/test/unit/profile_image_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProfileImageBlockTest < Test::Unit::TestCase +class ProfileImageBlockTest < ActiveSupport::TestCase should 'provide description' do assert_not_equal Block.description, ProfileImageBlock.description diff --git a/test/unit/profile_info_block_test.rb b/test/unit/profile_info_block_test.rb index aabb6db..18b0de6 100644 --- a/test/unit/profile_info_block_test.rb +++ b/test/unit/profile_info_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProfileInfoBlockTest < Test::Unit::TestCase +class ProfileInfoBlockTest < ActiveSupport::TestCase def setup @profile = create_user('mytestuser').person diff --git a/test/unit/profile_list_block_test.rb b/test/unit/profile_list_block_test.rb index 50ee43e..7f9be50 100644 --- a/test/unit/profile_list_block_test.rb +++ b/test/unit/profile_list_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProfileListBlockTest < Test::Unit::TestCase +class ProfileListBlockTest < ActiveSupport::TestCase should 'describe itself' do assert_not_equal Block.description, ProfileListBlock.description diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb index 30898f2..cd74584 100644 --- a/test/unit/profile_test.rb +++ b/test/unit/profile_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProfileTest < Test::Unit::TestCase +class ProfileTest < ActiveSupport::TestCase fixtures :profiles, :environments, :users, :roles, :domains def test_identifier_validation diff --git a/test/unit/recent_documents_block_test.rb b/test/unit/recent_documents_block_test.rb index 51195ed..cf8dd4e 100644 --- a/test/unit/recent_documents_block_test.rb +++ b/test/unit/recent_documents_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class RecentDocumentsBlockTest < Test::Unit::TestCase +class RecentDocumentsBlockTest < ActiveSupport::TestCase def setup @profile = create_user('testinguser').person diff --git a/test/unit/region_test.rb b/test/unit/region_test.rb index 9a1aeb2..b2a3f45 100644 --- a/test/unit/region_test.rb +++ b/test/unit/region_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class RegionTest < Test::Unit::TestCase +class RegionTest < ActiveSupport::TestCase should 'be a subclass of category' do assert_equal Category, Region.superclass diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb index 73c477c..e126a2d 100644 --- a/test/unit/rss_feed_test.rb +++ b/test/unit/rss_feed_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class RssFeedTest < Test::Unit::TestCase +class RssFeedTest < ActiveSupport::TestCase should 'indicate the correct mime/type' do assert_equal 'text/xml', RssFeed.new.mime_type diff --git a/test/unit/search_helper_test.rb b/test/unit/search_helper_test.rb index b197181..3b0e610 100644 --- a/test/unit/search_helper_test.rb +++ b/test/unit/search_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class SearchHelperTest < Test::Unit::TestCase +class SearchHelperTest < ActiveSupport::TestCase include SearchHelper diff --git a/test/unit/slug_test.rb b/test/unit/slug_test.rb index 71ba1cf..2a7b090 100644 --- a/test/unit/slug_test.rb +++ b/test/unit/slug_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' # tests for String#to_slug core extension. See lib/noosfero/core_ext/string.rb -class SlugTest < Test::Unit::TestCase +class SlugTest < ActiveSupport::TestCase should 'keep only alphanum' do assert_equal 'abc', 'abc!)@(*#&@!*#*)'.to_slug diff --git a/test/unit/sqlite_extension_test.rb b/test/unit/sqlite_extension_test.rb index 85a1e29..26f0779 100644 --- a/test/unit/sqlite_extension_test.rb +++ b/test/unit/sqlite_extension_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper' # if this test is run without SQLite (e.g. with mysql or postgres), the tests # will just pass. The idea is to test our local extensions to SQLite. -class SQliteExtensionTest < Test::Unit::TestCase +class SQliteExtensionTest < ActiveSupport::TestCase if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i diff --git a/test/unit/string_core_ext_test.rb b/test/unit/string_core_ext_test.rb index 58c33a1..956b23b 100644 --- a/test/unit/string_core_ext_test.rb +++ b/test/unit/string_core_ext_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' # tests for String core extension. See lib/noosfero/core_ext/string.rb -class StringCoreExtTest < Test::Unit::TestCase +class StringCoreExtTest < ActiveSupport::TestCase # tests for String#to_slug should 'keep only alphanum' do diff --git a/test/unit/tags_block_test.rb b/test/unit/tags_block_test.rb index 5b5863d..7b7b2a0 100644 --- a/test/unit/tags_block_test.rb +++ b/test/unit/tags_block_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TagsBlockTest < Test::Unit::TestCase +class TagsBlockTest < ActiveSupport::TestCase def setup @user = create_user('testinguser').person diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb index 568f9f7..26fa3ad 100644 --- a/test/unit/task_mailer_test.rb +++ b/test/unit/task_mailer_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TaskMailerTest < Test::Unit::TestCase +class TaskMailerTest < ActiveSupport::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb index 920f2bb..039223c 100644 --- a/test/unit/task_test.rb +++ b/test/unit/task_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TaskTest < Test::Unit::TestCase +class TaskTest < ActiveSupport::TestCase def setup ActionMailer::Base.delivery_method = :test diff --git a/test/unit/text_article_test.rb b/test/unit/text_article_test.rb index 8573be2..1e0facf 100644 --- a/test/unit/text_article_test.rb +++ b/test/unit/text_article_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TextArticleTest < Test::Unit::TestCase +class TextArticleTest < ActiveSupport::TestCase # mostly dummy test. Can be removed when (if) there are real tests for this # this class. diff --git a/test/unit/textile_article_test.rb b/test/unit/textile_article_test.rb index e2a90b7..d2a8de2 100644 --- a/test/unit/textile_article_test.rb +++ b/test/unit/textile_article_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TextileArticleTest < Test::Unit::TestCase +class TextileArticleTest < ActiveSupport::TestCase def setup @profile = create_user('testing').person diff --git a/test/unit/thickbox_helper_test.rb b/test/unit/thickbox_helper_test.rb index 3b279e7..d5e7720 100644 --- a/test/unit/thickbox_helper_test.rb +++ b/test/unit/thickbox_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ThickboxHelperTest < Test::Unit::TestCase +class ThickboxHelperTest < ActiveSupport::TestCase include ThickboxHelper def url_for(url) diff --git a/test/unit/thumbnail_test.rb b/test/unit/thumbnail_test.rb index 86a6c60..be74c45 100644 --- a/test/unit/thumbnail_test.rb +++ b/test/unit/thumbnail_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ThumbnailTest < Test::Unit::TestCase +class ThumbnailTest < ActiveSupport::TestCase should 'use sensible options' do assert_equal :file_system, Thumbnail.attachment_options[:storage] diff --git a/test/unit/tiny_mce_article_test.rb b/test/unit/tiny_mce_article_test.rb index 8b9d1dd..315f2e2 100644 --- a/test/unit/tiny_mce_article_test.rb +++ b/test/unit/tiny_mce_article_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TinyMceArticleTest < Test::Unit::TestCase +class TinyMceArticleTest < ActiveSupport::TestCase def setup Article.rebuild_index diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb index 1ea94d0..1e9b5c7 100644 --- a/test/unit/uploaded_file_test.rb +++ b/test/unit/uploaded_file_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class UploadedFileTest < Test::Unit::TestCase +class UploadedFileTest < ActiveSupport::TestCase def setup @profile = create_user('testinguser').person diff --git a/test/unit/user_mailer_test.rb b/test/unit/user_mailer_test.rb index e245dee..a6ef689 100644 --- a/test/unit/user_mailer_test.rb +++ b/test/unit/user_mailer_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserMailerTest < Test::Unit::TestCase +class UserMailerTest < ActiveSupport::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index cda95ac..6de0acc 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserTest < Test::Unit::TestCase +class UserTest < ActiveSupport::TestCase # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead. # Then, you can remove it from this and the functional test. include AuthenticatedTestHelper diff --git a/test/unit/validation_info_test.rb b/test/unit/validation_info_test.rb index 6dca63d..218b9c2 100644 --- a/test/unit/validation_info_test.rb +++ b/test/unit/validation_info_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ValidationInfoTest < Test::Unit::TestCase +class ValidationInfoTest < ActiveSupport::TestCase should 'validate the presence of validation methodology description' do info = ValidationInfo.new diff --git a/vendor/plugins/xss_terminate/lib/xss_terminate.rb b/vendor/plugins/xss_terminate/lib/xss_terminate.rb index d0da8c6..c373706 100644 --- a/vendor/plugins/xss_terminate/lib/xss_terminate.rb +++ b/vendor/plugins/xss_terminate/lib/xss_terminate.rb @@ -80,7 +80,7 @@ module XssTerminate end def sanitize_fields_with_full - sanitizer = RailsSanitize.full_sanitizer + sanitizer = ActionView::Base.full_sanitizer columns, columns_serialized = sanitize_columns(:full) columns.each do |column| sanitize_field(sanitizer, column.to_sym, columns_serialized.include?(column), :full) @@ -88,7 +88,7 @@ module XssTerminate end def sanitize_fields_with_white_list - sanitizer = RailsSanitize.white_list_sanitizer + sanitizer = ActionView::Base.white_list_sanitizer columns, columns_serialized = sanitize_columns(:white_list) columns.each do |column| sanitize_field(sanitizer, column.to_sym, columns_serialized.include?(column), :white_list) -- libgit2 0.21.2