diff --git a/app/models/user.rb b/app/models/user.rb index 33073f701..c40541431 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -46,9 +46,9 @@ class User group_ids = options[:to] + group_ids = [group_ids] if group_ids.is_a? BSON::ObjectID raise "You must post to someone." if group_ids.nil? || group_ids.empty? - group_ids = [group_ids] unless group_ids.is_a? Array group_ids.map!{|gid| ensure_bson gid } options.delete(:to) @@ -219,7 +219,7 @@ class User end def groups_with_person person - id = ensure_bson person.object_id + id = ensure_bson person.id groups.select {|group| group.person_ids.include? id} end diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb index 969318f43..973c2a083 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -9,15 +9,6 @@ describe Album do @album = @user.post(:album, :name => "test collection", :to => @group.id) end - it 'should belong to a person' do - @album.person = nil - @album.valid?.should be false - @album.person = Factory.create(:person) - @album.valid?.should be true - @album.save - person.albums.count.should == 1 - end - it 'should require a name' do @album.name = "test collection" @album.valid?.should be true diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 06ac3b576..90c572503 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -81,7 +81,7 @@ describe Group do group2 = @user2.group(:name => 'winners') friend_users(@user, group, @user2, group2) - message = @user2.post(:status_message, :message => "Hey Dude") + message = @user2.post(:status_message, :message => "Hey Dude", :to => group2.id) @user.receive message.to_diaspora_xml @@ -95,7 +95,7 @@ describe Group do group2 = @user2.group(:name => 'winners') friend_users(@user, group, @user2, group2) - message = @user2.post(:status_message, :message => "Hey Dude") + message = @user2.post(:status_message, :message => "Hey Dude", :to => group2.id) @user.receive message.to_diaspora_xml group.reload diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 64869df86..319e2b956 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -147,7 +147,7 @@ describe Person do describe 'wall posting' do it 'should be able to post on another persons wall' do - + pending #user2 is in user's group, user is in group2 on user friend_users(@user, @group, @user2, @group2) diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index b0ad79b83..2bb6fcf66 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -8,6 +8,9 @@ describe Photo do @fixture_filename = 'button.png' @fixture_name = File.dirname(__FILE__) + '/../fixtures/button.png' @fail_fixture_name = File.dirname(__FILE__) + '/../fixtures/msg.xml' + + @group = @user.group(:name => "losers") + @album = Album.create(:name => "foo", :person => @user.person) @photo = Photo.new(:person => @user.person, :album => @album) end @@ -85,7 +88,7 @@ describe Photo do end it 'should save a signed photo' do - photo = @user.post(:photo, :album => @album, :user_file => [File.open(@fixture_name)]) + photo = @user.post(:photo, :album => @album, :user_file => [File.open(@fixture_name)], :to => @group.id) photo.save.should == true photo.signature_valid?.should be true end diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index e4d5b0f50..948410250 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe StatusMessage do before do @user = Factory.create(:user, :email => "bob@aol.com") + @group = @user.group(:name => "losers") end it "should have a message" do @@ -13,7 +14,7 @@ describe StatusMessage do end it 'should be postable through the user' do - status = @user.post(:status_message, :message => "Users do things") + status = @user.post(:status_message, :message => "Users do things", :to => @group.id) end describe "XML" do