t#29061/t#29089/t#29076:add mylist. modify panel picture

[pettanr/pettanr.git] / spec / controllers / original_picture_license_groups_controller_spec.rb

diff --git a/spec/controllers/original_picture_license_groups_controller_spec.rb b/spec/controllers/original_picture_license_groups_controller_spec.rb
index aa2553c..9791a6c 100644 (file)
--- a/spec/controllers/original_picture_license_groups_controller_spec.rb
+++ b/spec/controllers/original_picture_license_groups_controller_spec.rb
@@ -4,14 +4,14 @@ require 'spec_helper'
 
 describe OriginalPictureLicenseGroupsController do
   before do
-    Factory :admin
-    @user = Factory( :user_yas)
+    FactoryGirl.create :admin
+    @user = FactoryGirl.create( :user_yas)
     @author = @user.author
-    @artist = Factory :artist_yas, :author_id => @author.id
-    @sp = Factory :system_picture
-    @lg = Factory :license_group, :classname => 'OriginalPicture'
-    @license = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
-    @op = Factory :original_picture, :artist_id => @artist.id
+    @artist = FactoryGirl.create :artist_yas, :author_id => @author.id
+    @sp = FactoryGirl.create :system_picture
+    @lg = FactoryGirl.create :license_group, :classname => 'OriginalPicture'
+    @license = FactoryGirl.create :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
+    @op = FactoryGirl.create :original_picture, :artist_id => @artist.id
   end
 
   describe '新規作成フォーム表示に於いて' do