Removed shoulda assertions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9088 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 1e5c89900e4251ea76afc60c7e081cecf500f368..6613ef0b2f1f12e6581a61338ccdefd0efa437e4 100644 (file)
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -44,35 +44,6 @@ class ProjectTest < ActiveSupport::TestCase
     User.current = nil
   end
 
-  should_validate_presence_of :name
-  should_validate_presence_of :identifier
-
-  should_validate_uniqueness_of :identifier
-
-  context "associations" do
-    should_have_many :members
-    should_have_many :users, :through => :members
-    should_have_many :member_principals
-    should_have_many :principals, :through => :member_principals
-    should_have_many :enabled_modules
-    should_have_many :issues
-    should_have_many :issue_changes, :through => :issues
-    should_have_many :versions
-    should_have_many :time_entries
-    should_have_many :queries
-    should_have_many :documents
-    should_have_many :news
-    should_have_many :issue_categories
-    should_have_many :boards
-    should_have_many :changesets, :through => :repository
-
-    should_have_one :repository
-    should_have_one :wiki
-
-    should_have_and_belong_to_many :trackers
-    should_have_and_belong_to_many :issue_custom_fields
-  end
-
   def test_truth
     assert_kind_of Project, @ecookbook
     assert_equal "eCookbook", @ecookbook.name

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index bb325165d4104693c153a349bbfccdb5c6fec78d..7fe66824df8e89f8bbc506d9cc419f8ffa16dd44 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -530,8 +530,6 @@ class UserTest < ActiveSupport::TestCase
     assert_equal 1, anon2.errors.count
   end
 
-  should_have_one :rss_token
-
   def test_rss_key
     assert_nil @jsmith.rss_token
     key = @jsmith.rss_key
@@ -541,9 +539,6 @@ class UserTest < ActiveSupport::TestCase
     assert_equal key, @jsmith.rss_key
   end
 
-
-  should_have_one :api_token
-
   context "User#api_key" do
     should "generate a new one if the user doesn't have one" do
       user = User.generate_with_protected!(:api_token => nil)