social_stream-base 0.5.2 → 0.6.0

data/spec/models/tie_spec.rb

@@ -1,22 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Tie do
-  context "between 2 users" do
-    before do
-      @sender, @receiver = 2.times.map{ Factory(:user) }
-    end
-
-    it "should be created from relation name" do
-      relation = @sender.relation_customs.first
-
-      tie = Tie.create :sender_id => @sender.actor_id,
-                       :receiver_id => @receiver.actor_id,
-                       :relation_name => relation.name
-
-      tie.should_not be_new_record
-    end
-  end
-
   describe "follower_count" do
     it "should be incremented" do
       sender, receiver = 2.times.map{ Factory(:user) }
@@ -29,8 +13,7 @@ describe Tie do
                           merge(Permission.follow).
                           first
 
-      Tie.create :sender_id => sender.actor_id,
-                 :receiver_id => receiver.actor_id,
+      Tie.create :contact_id => sender.contact_to!(receiver).id,
                  :relation_id => follower_relation.id
 
       receiver.reload.follower_count.should eq(count + 1)
@@ -38,134 +21,23 @@ describe Tie do
     
     it "should be decremented" do
       tie = Factory(:friend)
+      contact = tie.contact
       receiver = tie.receiver
       count = receiver.follower_count
 
-      tie.destroy
+      contact.reload.relation_ids = []
 
       receiver.reload.follower_count.should eq(count - 1)
     end
   end
 
-  context "replied" do
-    before do
-      @sent = Factory(:friend)
-      @received = Factory(:friend,
-                         :sender_id => @sent.receiver_id,
-                         :receiver_id => @sent.sender_id)
-    end
-
-    it "should be found by scopes" do
-      Tie.replied.should include(@sent)
-      Tie.replied.should include(@received)
-      Tie.replying(@sent).should include(@received)
-      Tie.replying(@received).should include(@sent)
-    end
-  end
-
   describe "friend" do
     before do
       @tie = Factory(:friend)
     end
 
     it "should create pending" do
-
-      assert @tie.receiver.pending_ties.present?
-      assert @tie.receiver.pending_ties.first.relation_set.blank?
-    end
-
-    it "should be following" do
-      assert Tie.following(@tie.receiver_id).include?(@tie)
-    end
-
-    describe ", receiver" do
-      before do
-        @s = @tie.receiver
-      end
-
-      it "creates activity" do
-        Tie.allowing(@s, 'create', 'activity').should include(@tie)
-      end
-
-      it "reads activity" do
-        Tie.allowing(@s, 'read', 'activity').should include(@tie)
-      end
-    end
-
-    describe ", friend" do
-      before do
-        @s = Factory(:friend, :sender => @tie.sender).receiver
-      end
-
-      it "creates activity" do
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-      end
-
-      it "reads activity" do
-        Tie.allowing(@s, 'read', 'activity').should include(@tie)
-      end
-    end
-
-    describe ", acquaintance" do
-      before do
-        @s = Factory(:acquaintance, :receiver => @tie.receiver).sender
-      end
-
-      it "creates activity" do
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-      end
-
-      it "reads activity" do
-        Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
-      end
-    end
-
-    describe ", alien" do
-      before do
-        @s = Factory(:user)
-      end
-
-      it "creates activity" do
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-      end
-      
-      it "reads activity" do
-        Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
-      end
-    end
-  end
-
-  describe "member" do
-    before do
-      @tie = Factory(:member)
-    end
-
-    describe ", receiver" do
-      before do
-        @s = @tie.receiver
-      end
-
-      it "updates activity" do
-        Tie.allowing(@s, 'update', 'activity').should include(@tie)
-      end
-    end
-
-    describe ", member" do
-      before do
-        @s = Factory(:member, :sender => @tie.sender).receiver
-      end
-
-      it "creates activity" do
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-      end
-
-       it "reads activity" do
-        Tie.allowing(@s, 'read', 'activity').should include(@tie)
-      end
-
-      it "updates activity" do
-        Tie.allowing(@s, 'update', 'activity').should_not include(@tie)
-      end
+      @tie.receiver.received_contacts.pending.should be_present
     end
   end
 end

data/spec/models/user_spec.rb

@@ -18,5 +18,9 @@ describe User do
 
     assert ! user.represented.include?(tie.sender_subject)
   end
+
+  it "should have activity object" do
+    Factory(:user).activity_object.should be_present
+  end
 end
 

data/spec/support/migrations.rb

@@ -11,7 +11,7 @@ end
 
 # Social Stream Base
 MigrationFinder.new 'social_stream-base',
-                    ['generators', 'social_stream', 'base', 'templates', 'migration']
+                    ['..', 'db', 'migrate', '20110610112023_create_social_stream']
 
 # acts-as-taggable-on
 MigrationFinder.new 'acts-as-taggable-on',