* Removed Pixa/Tinami sources

* Upgraded to Rails 3.2.3
* Fixed tests

test/unit/dmail_test.rb

@@ -4,7 +4,7 @@ class DmailTest < ActiveSupport::TestCase
   context "A dmail" do
     setup do
       MEMCACHE.flush_all
-      @user = Factory.create(:user)
+      @user = FactoryGirl.create(:user)
       CurrentUser.user = @user
       CurrentUser.ip_addr = "127.0.0.1"
       ActionMailer::Base.delivery_method = :test
@@ -18,7 +18,7 @@ class DmailTest < ActiveSupport::TestCase
     
     context "search" do
       should "return results based on title contents" do
-        dmail = Factory.create(:dmail, :title => "xxx", :owner => @user)
+        dmail = FactoryGirl.create(:dmail, :title => "xxx", :owner => @user)
         matches = Dmail.search_message("xxx")
         assert(matches.any?)
         matches = Dmail.search_message("aaa")
@@ -26,7 +26,7 @@ class DmailTest < ActiveSupport::TestCase
       end
       
       should "return results based on body contents" do
-        dmail = Factory.create(:dmail, :body => "xxx", :owner => @user)
+        dmail = FactoryGirl.create(:dmail, :body => "xxx", :owner => @user)
         matches = Dmail.search_message("xxx")
         assert(matches.any?)
         matches = Dmail.search_message("aaa")
@@ -35,14 +35,14 @@ class DmailTest < ActiveSupport::TestCase
     end
     
     should "should parse user names" do
-      dmail = Factory.build(:dmail, :owner => @user)
+      dmail = FactoryGirl.build(:dmail, :owner => @user)
       dmail.to_id = nil
       dmail.to_name = @user.name
       assert(dmail.to_id == @user.id)
     end
     
     should "construct a response" do
-      dmail = Factory.create(:dmail, :owner => @user)
+      dmail = FactoryGirl.create(:dmail, :owner => @user)
       response = dmail.build_response
       assert_equal("Re: #{dmail.title}", response.title)
       assert_equal(dmail.from_id, response.to_id)
@@ -50,28 +50,28 @@ class DmailTest < ActiveSupport::TestCase
     end
     
     should "create a copy for each user" do
-      @new_user = Factory.create(:user)
+      @new_user = FactoryGirl.create(:user)
       assert_difference("Dmail.count", 2) do
         Dmail.create_split(:to_id => @new_user.id, :title => "foo", :body => "foo")
       end
     end
 
     should "send an email if the user wants it" do
-      user = Factory.create(:user, :receive_email_notifications => true)
+      user = FactoryGirl.create(:user, :receive_email_notifications => true)
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
-        Factory.create(:dmail, :to => user, :owner => @user)
+        FactoryGirl.create(:dmail, :to => user, :owner => @user)
       end
     end
     
     should "be marked as read after the user reads it" do
-      dmail = Factory.create(:dmail, :owner => @user)
+      dmail = FactoryGirl.create(:dmail, :owner => @user)
       assert(!dmail.is_read?)
       dmail.mark_as_read!
       assert(dmail.is_read?)
     end
     
     should "notify the recipient he has mail" do
-      dmail = Factory.create(:dmail, :owner => @user)
+      dmail = FactoryGirl.create(:dmail, :owner => @user)
       assert(dmail.to(true).has_mail?)
       dmail.mark_as_read!
       assert(!dmail.to(true).has_mail?)