Merge branch 'master' of github.com:diaspora/diaspora

Gemfile

@@ -101,6 +101,8 @@ group :test, :development do
 end
 
 group :test do
+  gem 'mysql2', '0.2.6'
+  gem 'pg'
   gem 'factory_girl_rails'
   gem 'fixture_builder', '0.2.2'
   gem 'selenium-webdriver', '2.4'

Gemfile.lock

@@ -319,6 +319,7 @@ GEM
       oa-openid (= 0.2.6)
     open4 (1.1.0)
     orm_adapter (0.0.5)
+    pg (0.11.0)
     polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.2.3)
@@ -498,6 +499,7 @@ DEPENDENCIES
   oauth2-provider (= 0.0.16)
   ohai (= 0.5.8)
   omniauth (= 0.2.6)
+  pg
   rails (= 3.0.9)
   rails-i18n
   rcov

spec/integration/receiving_spec.rb

@@ -233,10 +233,10 @@ describe 'a user receives a post' do
         receive_with_zord(bob, alice.person, xml)
         receive_with_zord(eve, alice.person, xml)
 
-        @comment = eve.comment('tada',:post => @post)
-        @comment.parent_author_signature = @comment.sign_with_key(alice.encryption_key)
-        @xml = @comment.to_diaspora_xml
-        @comment.delete
+        comment = eve.comment('tada',:post => @post)
+        comment.parent_author_signature = comment.sign_with_key(alice.encryption_key)
+        @xml = comment.to_diaspora_xml
+        comment.delete
       end
 
       it 'should correctly attach the user already on the pod' do
@@ -254,17 +254,14 @@ describe 'a user receives a post' do
         eve.delete
         Person.where(:id => remote_person.id).delete_all
         Profile.where(:person_id => remote_person.id).delete_all
-        remote_person.id = nil
+        remote_person.attributes.delete(:id) # leaving a nil id causes it to try to save with id set to NULL in postgres
 
-        Person.should_receive(:by_account_identifier).twice.and_return{ |handle|
-          if handle == alice.person.diaspora_handle
-            alice.person.save
-            alice.person
-          else
-            remote_person.save(:validate => false)
-            remote_person.profile = Factory(:profile, :person => remote_person)
-            remote_person
-          end
+        m = mock()
+        Webfinger.should_receive(:new).twice.with(eve.person.diaspora_handle).and_return(m)
+        m.should_receive(:fetch).twice.and_return{
+          remote_person.save(:validate => false)
+          remote_person.profile = Factory(:profile, :person => remote_person)
+          remote_person
         }
 
         bob.reload.visible_posts.size.should == 1

spec/models/user_spec.rb

@@ -409,18 +409,22 @@ describe User do
     end
   end
 
-  describe ".find_for_authentication" do
+  describe ".find_for_database_authentication" do
     it 'finds a user' do
-      User.find_for_authentication(:username => alice.username).should == alice
+      User.find_for_database_authentication(:username => alice.username).should == alice
+    end
+
+    it 'finds a user by email' do
+      User.find_for_database_authentication(:username => alice.email).should == alice
     end
 
     it "does not preserve case" do
-      User.find_for_authentication(:username => alice.username.upcase).should == alice
+      User.find_for_database_authentication(:username => alice.username.upcase).should == alice
     end
 
     it 'errors out when passed a non-hash' do
       lambda {
-        User.find_for_authentication(alice.username)
+        User.find_for_database_authentication(alice.username)
       }.should raise_error
     end
   end