t#30200:update i18n devise

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

diff --git a/spec/models/balloon_spec.rb b/spec/models/balloon_spec.rb
index a7317f9..17f0b58 100644 (file)
--- a/spec/models/balloon_spec.rb
+++ b/spec/models/balloon_spec.rb
@@ -3,9 +3,9 @@ require 'spec_helper'
 #セリフ\r
 describe Balloon do\r
   before do\r
-    FactoryGirl.create :admin\r
+    @admin = FactoryGirl.create :admin\r
     @user = FactoryGirl.create( :user_yas)\r
-    @author = @user.author\r
+    @author = FactoryGirl.create :author, :user_id => @user.id\r
     @artist = FactoryGirl.create :artist_yas, :author_id => @author.id\r
     \r
     @balloon = FactoryGirl.create :panel\r
@@ -18,25 +18,25 @@ describe Balloon do
     before do\r
       @balloon = FactoryGirl.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id\r
     end\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 'オーソドックスなデータのとき' do\r
+      it '下限データが通る' do\r
+        @balloon.x = 0\r
+        @balloon.y = 0\r
+        @balloon.width = 1\r
+        @balloon.height = 1\r
+        @balloon.should be_valid\r
+      end\r
+      it '上限データが通る' do\r
+        @balloon.x = 99999\r
+        @balloon.y = 99999\r
+        @balloon.width = 99999\r
+        @balloon.height = 99999\r
+        @balloon.should be_valid\r
+      end\r
+    end\r
+    \r
     context 'speech_balloon_idを検証するとき' do\r
-      #ネストの保存はnilを許可しなければならないので数値チェックだけ
+      #ネストの保存はnilを許可しなければならないので数値チェックだけ\r
       it 'テストデータの確認' do\r
         @balloon.speech_balloon_id = @speech_balloon.id\r
         @balloon.should be_valid\r