t#30200:update i18n devise

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

diff --git a/spec/controllers/panels_controller_spec.rb b/spec/controllers/panels_controller_spec.rb
index 8e6c8e1..f9bfacd 100644 (file)
--- a/spec/controllers/panels_controller_spec.rb
+++ b/spec/controllers/panels_controller_spec.rb
@@ -3,12 +3,12 @@ require 'spec_helper'
 #コマ\r
 describe PanelsController do\r
   before do\r
-    FactoryGirl.create :admin\r
+    @admin = FactoryGirl.create :admin\r
     @sp = FactoryGirl.create :system_picture\r
     @lg = FactoryGirl.create :license_group\r
     @license = FactoryGirl.create :license, :license_group_id => @lg.id, :system_picture_id => @sp.id\r
     @user = FactoryGirl.create :user_yas\r
-    @author = @user.author    #ユーザ作成時に連動して作成される\r
+    @author = FactoryGirl.create :author, :user_id => @user.id\r
   end\r
   \r
   describe '一覧表示に於いて' do\r
@@ -71,10 +71,10 @@ describe PanelsController do
           get :index, :format => :json\r
           lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
         end\r
-        it 'コマモデルにコマリストのjson出力を問い合わせている' do
-          Panel.should_receive(:list_as_json_text).exactly(1)
-          get :index, :format => :json
-        end
+        it 'コマモデルにコマリストのjson出力を問い合わせている' do\r
+          Panel.should_receive(:list_as_json_text).exactly(1)\r
+          get :index, :format => :json\r
+        end\r
         it 'データがリスト構造になっている' do\r
           get :index, :format => :json\r
           json = JSON.parse response.body\r
@@ -148,10 +148,10 @@ describe PanelsController do
           get :show, :id => @panel.id, :format => :json\r
           lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
         end\r
-        it 'コマモデルにコマのjson出力を問い合わせている' do
-          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)
-          get :show, :id => @panel.id, :format => :json
-        end
+        it 'コマモデルにコマのjson出力を問い合わせている' do\r
+          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)\r
+          get :show, :id => @panel.id, :format => :json\r
+        end\r
         it 'データがアレになっている' do\r
           get :show, :id => @panel.id, :format => :json\r
           json = JSON.parse response.body\r
@@ -277,16 +277,16 @@ describe PanelsController do
           response.should render_template("new")\r
         end\r
       end\r
-      context 'json形式' do
-        it 'jsonデータを返す' do
-          get :new, :format => :json
-          lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)
-        end
-        it 'コマモデルにコマのjson出力を問い合わせている' do
-          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)
-          get :new, :format => :json
-        end
-      end
+      context 'json形式' do\r
+        it 'jsonデータを返す' do\r
+          get :new, :format => :json\r
+          lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
+        end\r
+        it 'コマモデルにコマのjson出力を問い合わせている' do\r
+          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)\r
+          get :new, :format => :json\r
+        end\r
+      end\r
     end\r
     context '作家権限がないとき' do\r
       before do\r
@@ -377,10 +377,10 @@ describe PanelsController do
           post :create, :panel => @attr, :format => :json\r
           lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
         end\r
-        it 'コマモデルにコマのjson出力を問い合わせている' do
-          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)
+        it 'コマモデルにコマのjson出力を問い合わせている' do\r
+          Panel.any_instance.should_receive(:panel_elements_as_json).exactly(1)\r
           post :create, :panel => @attr, :format => :json\r
-        end
+        end\r
         it 'データがアレになっている' do\r
           post :create, :panel => @attr, :format => :json\r
           json = JSON.parse response.body\r