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

.gitignore

@@ -19,3 +19,4 @@ gpg/*/random_seed
 public/uploads/*
 public/source.tar
 tmp/**/*
+capybara-*.html

lib/tasks/ci.rake

@@ -0,0 +1,4 @@
+desc "Run all specs and features"
+task :ci => [:environment] do
+  system "bundle exec rake"
+end

spec/models/user/user_friending_spec.rb

@@ -45,12 +45,13 @@ describe User do
       Request.count.should == 0
     end
 
-    it 'should not be able to friend request an existing friend' do friend = Factory.create(:person)
+    it 'should not be able to friend request an existing friend' do
+      friend = Factory.create(:person)
 
       @user.friends << friend
       @user.save
 
-      proc {@user.send_friend_request_to( friend, @aspect)}.should raise_error
+      proc { @user.send_friend_request_to(friend, @aspect) }.should raise_error
     end
 
     describe 'multiple users accepting/rejecting the same person' do
@@ -133,7 +134,7 @@ describe User do
 
         @user2.receive @req_two_xml
         @user2.pending_requests.size.should be 1
-        @user2.ignore_friend_request @user2.pending_requests.first.id#@request_two.id
+        @user2.ignore_friend_request @user2.pending_requests.first.id #@request_two.id
         @user2.friends.include?(@person_one).should be false
         Person.all.count.should be 3
       end
@@ -209,19 +210,14 @@ describe User do
           @user2.receive @message.to_diaspora_xml.to_s
           @user2.unfriend @user.person
           @user.unfriended_by @user2.person
-        @aspect.reload
-        @aspect2.reload
-        @user.reload
-        @user2.reload
         end
         it "deletes the unfriended user's posts from visible_posts" do
-        @user.raw_visible_posts.include?(@message.id).should be_false
+          @user.raw_visible_posts(true).include?(@message.id).should be_false
         end
         it "deletes the unfriended user's posts from the aspect's posts" do
-        @aspect2.posts.include?(@message).should be_false
+          @aspect2.posts(true).include?(@message).should be_false
         end
       end
     end
-
   end
 end