From b6bc3a3665deded5046b96cb58349aa6d73ce539 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:32:19 +0000 Subject: [PATCH] Merged r3926 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3976 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/lib/redmine/menu_manager/menu_item_test.rb | 2 +- test/unit/lib/redmine/menu_manager_test.rb | 6 +----- test/unit/lib/redmine_test.rb | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/unit/lib/redmine/menu_manager/menu_item_test.rb b/test/unit/lib/redmine/menu_manager/menu_item_test.rb index 835e154d8..ab17d4a4b 100644 --- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb +++ b/test/unit/lib/redmine/menu_manager/menu_item_test.rb @@ -24,7 +24,7 @@ module RedmineMenuTestHelper end end -class Redmine::MenuManager::MenuItemTest < Test::Unit::TestCase +class Redmine::MenuManager::MenuItemTest < ActiveSupport::TestCase include RedmineMenuTestHelper Redmine::MenuManager.map :test_menu do |menu| diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb index 0c01ca323..200ed3976 100644 --- a/test/unit/lib/redmine/menu_manager_test.rb +++ b/test/unit/lib/redmine/menu_manager_test.rb @@ -17,7 +17,7 @@ require File.dirname(__FILE__) + '/../../../test_helper' -class Redmine::MenuManagerTest < Test::Unit::TestCase +class Redmine::MenuManagerTest < ActiveSupport::TestCase context "MenuManager#map" do should "be tested" end @@ -25,8 +25,4 @@ class Redmine::MenuManagerTest < Test::Unit::TestCase context "MenuManager#items" do should "be tested" end - - should "be tested" do - assert true - end end diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb index 5150da1f2..2d32abdcb 100644 --- a/test/unit/lib/redmine_test.rb +++ b/test/unit/lib/redmine_test.rb @@ -33,7 +33,7 @@ module RedmineMenuTestHelper end end -class RedmineTest < Test::Unit::TestCase +class RedmineTest < ActiveSupport::TestCase include RedmineMenuTestHelper def test_top_menu -- 2.39.5