Merged r3926 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3976 e93f8b46-1217-0410-a6f0-8f06a7374b81

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 835e154d811afe8bfaf4a0e5f7858ef636949b52..ab17d4a4b5ce1b69a6e6b728d2e2a7c68b723455 100644 (file)
--- 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 0c01ca323694da9061a14ef07d75d9ed1fb7dc7a..200ed3976d9e9af9e9bb2c0c24928a642e2d71a9 100644 (file)
--- 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 5150da1f20bafc51324824fc353f3b2ec121886a..2d32abdcb53e4e5a6e46d9bf819aa12da1cafa93 100644 (file)
--- 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