merge v04

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

diff --git a/spec/controllers/comics_controller_spec.rb b/spec/controllers/comics_controller_spec.rb
index 7ae248d..8879610 100644 (file)
--- a/spec/controllers/comics_controller_spec.rb
+++ b/spec/controllers/comics_controller_spec.rb
@@ -1,10 +1,12 @@
 # -*- encoding: utf-8 -*-\r
-require 'spec_helper'\r
-\r
-describe ComicsController do\r
-  before do\r
-    Factory :admin\r
-    @license = Factory :license\r
+require 'spec_helper'
+
+describe ComicsController do
+  before do
+    Factory :admin
+    @sp = Factory :system_picture
+    @lg = Factory :license_group
+    @license = Factory :license, :license_group_id => @lg.id, :system_picture_id => @sp.id
     @user = Factory :user_yas\r
     @author = @user.author    #ユーザ作成時に連動して作成される\r
   end\r