merge v06sheet

[pettanr/pettanr.git] / spec / models / panel_spec.rb

diff --git a/spec/models/panel_spec.rb b/spec/models/panel_spec.rb
index f9aa572..20afa07 100644 (file)
--- a/spec/models/panel_spec.rb
+++ b/spec/models/panel_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 #コマ\r
 describe Panel do\r
   before do\r
+    SpeechBalloonTemplate.delete_all\r
     @admin = FactoryGirl.create :admin\r
     @sp = FactoryGirl.create :system_picture\r
     @lg = FactoryGirl.create :license_group\r
@@ -30,9 +31,6 @@ describe Panel do
         @panel.width = 1\r
         @panel.height = 1\r
         @panel.border = 0\r
-        @panel.x = -99999\r
-        @panel.y = -99999\r
-        @panel.z = 1\r
         @panel.publish = 0\r
         @panel.should be_valid\r
       end\r
@@ -40,9 +38,6 @@ describe Panel do
         @panel.width = 99999\r
         @panel.height = 99999\r
         @panel.border = 99999\r
-        @panel.x = 99999\r
-        @panel.y = 99999\r
-        @panel.z = 99999\r
         @panel.publish = 99999\r
         @panel.should be_valid\r
       end\r
@@ -102,48 +97,6 @@ describe Panel do
         @panel.should be_valid\r
       end\r
     end\r
-    context 'xを検証するとき' do\r
-      it '数値でなければ失敗する' do\r
-        @panel.x = 'a'\r
-        @panel.should_not be_valid\r
-      end\r
-      it '0なら通る' do\r
-        @panel.x = '0'\r
-        @panel.should be_valid\r
-      end\r
-      it '負でも通る' do\r
-        @panel.x = -1\r
-        @panel.should be_valid\r
-      end\r
-    end\r
-    context 'yを検証するとき' do\r
-      it '数値でなければ失敗する' do\r
-        @panel.y = 'a'\r
-        @panel.should_not be_valid\r
-      end\r
-      it '0なら通る' do\r
-        @panel.y = '0'\r
-        @panel.should be_valid\r
-      end\r
-      it '負でも通る' do\r
-        @panel.y = -1\r
-        @panel.should be_valid\r
-      end\r
-    end\r
-    context 'zを検証するとき' do\r
-      it '数値でなければ失敗する' do\r
-        @panel.z = 'a'\r
-        @panel.should_not be_valid\r
-      end\r
-      it '0なら失敗する' do\r
-        @panel.z = '0'\r
-        @panel.should_not be_valid\r
-      end\r
-      it '負なら失敗する' do\r
-        @panel.z = -1\r
-        @panel.should_not be_valid\r
-      end\r
-    end\r
     context 'author_idを検証するとき' do\r
       it 'nullなら失敗する' do\r
         @panel.author_id = nil\r
@@ -253,9 +206,9 @@ describe Panel do
   \r
   describe '閲覧許可に於いて' do\r
     before do\r
-      @comic = FactoryGirl.create :comic, :author_id => @author.id\r
+      @scroll = FactoryGirl.create :scroll, :author_id => @author.id\r
       @panel = FactoryGirl.create :panel, :author_id => @author.id\r
-      @story = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id\r
+      @scroll_panel = FactoryGirl.create :scroll_panel, :author_id => @author.id, :scroll_id => @scroll.id, :panel_id => @panel.id\r
     end\r
     context 'オープンモードのとき' do\r
       before do\r
@@ -1418,7 +1371,7 @@ describe Panel do
   \r
   describe '削除に於いて' do\r
     before do\r
-      @comic = FactoryGirl.create :comic, :author_id => @author.id\r
+      @scroll = FactoryGirl.create :scroll, :author_id => @author.id\r
       @panel = FactoryGirl.create :panel, :author_id => @author.id, :publish => 1\r
       @pp = FactoryGirl.create :panel_picture, :panel_id => @panel.id, :t => 1, :width => @p.width, :height => @p.height\r
       @sb = @panel.speech_balloons.build(\r