t#29400:update:itr2

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

diff --git a/spec/models/balloon_spec.rb b/spec/models/balloon_spec.rb
index 9f30e69..a7317f9 100644 (file)
--- a/spec/models/balloon_spec.rb
+++ b/spec/models/balloon_spec.rb
@@ -16,17 +16,26 @@ describe Balloon do
   \r
   describe '検証に於いて' do\r
     before do\r
-    end\r
-    \r
-    it 'オーソドックスなデータなら通る' do\r
       @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      @balloon.should be_valid\r
     end\r
-    \r
+    context 'オーソドックスなデータのとき' do
+      it '下限データが通る' do
+        @balloon.x = 0
+        @balloon.y = 0
+        @balloon.width = 1
+        @balloon.height = 1
+        @balloon.should be_valid
+      end
+      it '上限データが通る' do
+        @balloon.x = 99999
+        @balloon.y = 99999
+        @balloon.width = 99999
+        @balloon.height = 99999
+        @balloon.should be_valid
+      end
+    end
+    
     context 'speech_balloon_idを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
       #ネストの保存はnilを許可しなければならないので数値チェックだけ
       it 'テストデータの確認' do\r
         @balloon.speech_balloon_id = @speech_balloon.id\r
@@ -38,13 +47,6 @@ describe Balloon do
       end\r
     end\r
     context 'system_picture_idを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.system_picture_id = @system_picture.id\r
-        @balloon.should be_valid\r
-      end\r
       it 'nullなら失敗する' do\r
         @balloon.system_picture_id = nil\r
         @balloon.should_not be_valid\r
@@ -59,13 +61,6 @@ describe Balloon do
       end\r
     end\r
     context 'xを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.x = '1'\r
-        @balloon.should be_valid\r
-      end\r
       it 'nullなら失敗する' do\r
         @balloon.x = nil\r
         @balloon.should_not be_valid\r
@@ -84,13 +79,6 @@ describe Balloon do
       end\r
     end\r
     context 'yを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.y = '1'\r
-        @balloon.should be_valid\r
-      end\r
       it 'nullなら失敗する' do\r
         @balloon.y = nil\r
         @balloon.should_not be_valid\r
@@ -109,13 +97,6 @@ describe Balloon do
       end\r
     end\r
     context 'widthを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.width = 1\r
-        @balloon.should be_valid\r
-      end\r
       it 'nullなら失敗する' do\r
         @balloon.width = nil\r
         @balloon.should_not be_valid\r
@@ -134,13 +115,6 @@ describe Balloon do
       end\r
     end\r
     context 'heightを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.height = '1'\r
-        @balloon.should be_valid\r
-      end\r
       it 'nullなら失敗する' do\r
         @balloon.height = nil\r
         @balloon.should_not be_valid\r
@@ -159,20 +133,7 @@ describe Balloon do
       end\r
     end\r
     context 'settingsを検証するとき' do\r
-      before do\r
-        @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
-      end\r
-      it 'テストデータの確認' do\r
-        @balloon.settings = ''\r
-        @balloon.should be_valid\r
-      end\r
-    end\r
-  end\r
-  \r
-  describe 'データ補充に於いて' do\r
-    before do\r
     end\r
-    \r
   end\r
   \r
 end\r