From 02c07fefb253f1aa90ece85cc54052b12a4cfa8c Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 3 Dec 2014 14:07:42 -0800 Subject: [PATCH] fix tests --- test/unit/dmail_test.rb | 2 +- test/unit/forum_topic_test.rb | 2 +- test/unit/user_name_change_request_test.rb | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/unit/dmail_test.rb b/test/unit/dmail_test.rb index 8eb4afc30..5508aaac9 100644 --- a/test/unit/dmail_test.rb +++ b/test/unit/dmail_test.rb @@ -20,7 +20,7 @@ class DmailTest < ActiveSupport::TestCase setup do @recipient = FactoryGirl.create(:user) @recipient.create_dmail_filter(:words => "banned") - @dmail = FactoryGirl.build(:dmail, :title => "xxx", :owner => @recipient, :body => "banned word here", :to => @recipient) + @dmail = FactoryGirl.build(:dmail, :title => "xxx", :owner => @recipient, :body => "banned word here", :to => @recipient, :from => @user) end should "detect banned words" do diff --git a/test/unit/forum_topic_test.rb b/test/unit/forum_topic_test.rb index 3e6a9b65d..0603e87cf 100644 --- a/test/unit/forum_topic_test.rb +++ b/test/unit/forum_topic_test.rb @@ -123,7 +123,7 @@ class ForumTopicTest < ActiveSupport::TestCase should "merge all the posts in one topic into the other" do @topic.merge(@topic2) - assert_equal(2, @topic.posts.count) + assert_equal(2, @topic2.posts.count) end end diff --git a/test/unit/user_name_change_request_test.rb b/test/unit/user_name_change_request_test.rb index 93a8079c6..88754e86a 100644 --- a/test/unit/user_name_change_request_test.rb +++ b/test/unit/user_name_change_request_test.rb @@ -74,17 +74,6 @@ class UserNameChangeRequestTest < ActiveSupport::TestCase end context "creating a new request" do - should "send dmails to the admin" do - assert_difference("Dmail.count", 2) do - UserNameChangeRequest.create( - :user_id => @requester.id, - :original_name => @requester.name, - :status => "pending", - :desired_name => "abc" - ) - end - end - should "not validate if the desired name already exists" do assert_difference("UserNameChangeRequest.count", 0) do req = UserNameChangeRequest.create(