X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spec%2Fmodels%2Fpicture_spec.rb;fp=spec%2Fmodels%2Fpicture_spec.rb;h=a4e372e5a4fa3d118aafce517a76e14a7cb21fa4;hb=2bd8e046bbbdd6d620af0637c3291cc7d787b0c5;hp=eb6e962608bda7e5c44dd214c0fc7cc04a4e1c0a;hpb=c1ce32fbd93b9412ac557fe4d2e53887708caafd;p=pettanr%2Fpettanr.git diff --git a/spec/models/picture_spec.rb b/spec/models/picture_spec.rb index eb6e9626..a4e372e5 100644 --- a/spec/models/picture_spec.rb +++ b/spec/models/picture_spec.rb @@ -4,12 +4,12 @@ require 'spec_helper' describe Picture do before do - FactoryGirl.create :admin + @admin = FactoryGirl.create :admin @user = FactoryGirl.create( :user_yas) - @author = @user.author + @author = FactoryGirl.create :author, :user_id => @user.id @artist = FactoryGirl.create :artist_yas, :author_id => @author.id @other_user = FactoryGirl.create( :user_yas) - @other_author = @other_user.author + @other_author = FactoryGirl.create :author, :user_id => @other_user.id @other_artist = FactoryGirl.create :artist_yas, :author_id => @other_author.id @sp = FactoryGirl.create :system_picture @lg = FactoryGirl.create :license_group