Skip to content
Extraits de code Groupes Projets
Valider 41aa8ed1 rédigé par Raphael's avatar Raphael
Parcourir les fichiers

Specs pass again, need to make albums have a group

parent f23a9d80
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter