fix panel test

[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 fbc8e26..e7c058e 100644 (file)
--- a/spec/controllers/panels_controller_spec.rb
+++ b/spec/controllers/panels_controller_spec.rb
@@ -138,7 +138,7 @@ describe PanelsController do
         it 'データがアレになっている' do\r
           get :show, :id => @panel.id, :format => :json\r
           json = JSON.parse response.body\r
-          json["width"].should match(/438/)\r
+          json["width"].should eq 100\r
         end\r
       end\r
     end\r
@@ -290,7 +290,7 @@ describe PanelsController do
   \r
   describe '新規作成に於いて' do\r
     before do\r
-      @panel = Factory :normal_panel, :author_id => @user.author.id, :comic_id => @comic.id\r
+      @panel = Factory :panel, :author_id => @user.author.id, :comic_id => @comic.id\r
       sign_in @user\r
     end\r
     context '事前チェックする' do\r
@@ -299,57 +299,57 @@ describe PanelsController do
         Panel.stub(:count).and_return(10)\r
       end\r
       it 'panelがパラメータにあれば、展開する' do\r
-        post :create, :panel => Factory.attributes_for(:panel, :panel_id => @panel.id)\r
-        assigns(:prm)['border'].to_i.should eq 1\r
+        post :create, :panel => Factory.attributes_for(:panel, :comic_id => @comic.id)\r
+        assigns(:prm)['border'].to_i.should eq @panel.border\r
       end\r
       it 'jsonがパラメータにあれば、展開する' do\r
-        post :create, :json => Factory.attributes_for(:panel, :panel_id => @panel.id, :border => 4).to_s\r
+        post :create, :json => Factory.attributes_for(:panel, :comic_id => @comic.id, :border => 4).to_json\r
         assigns(:prm)['border'].to_i.should eq 4\r
       end\r
       it 'panel・json両パラメータがあれば、panelを優先して展開する' do\r
         post :create, {\r
-          :panel => Factory.attributes_for(:panel, :panel_id => @panel.id), \r
-          :json => Factory.attributes_for(:panel, :panel_id => @panel.id, :border => 4).to_s\r
+          :panel => Factory.attributes_for(:panel, :comic_id => @comic.id), \r
+          :json => Factory.attributes_for(:panel, :comic_id => @comic.id, :border => 4).to_json\r
         }\r
-        assigns(:prm)['border'].to_i.should eq 1\r
+        assigns(:prm)['border'].to_i.should eq @panel.border\r
       end\r
     end\r
     context 'つつがなく終わるとき' do\r
       it 'モデルに保存依頼する' do\r
-        Panel.any_instance.should_receive(:save).exactly(1)\r
-        post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+        Panel.any_instance.should_receive(:store).exactly(1)\r
+        post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
       end\r
       it "@panelに作成されたコマを保持していて、それがDBにある" do\r
-        post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+        post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
         assigns(:panel).should be_a(Panel)\r
         assigns(:panel).should be_persisted\r
       end\r
       context 'html形式' do\r
         it 'ステータスコード302 Foundを返す' do\r
-          Panel.any_instance.stub(:save).and_return(true)\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+          Panel.any_instance.stub(:store).and_return(true)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.status.should eq 302\r
         end\r
         it '作成されたコマの表示ページへ遷移する' do\r
-#          Panel.any_instance.stub(:save).and_return(true)\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+#          Panel.any_instance.stub(:store).and_return(true)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.should redirect_to(Panel.last)\r
         end\r
       end\r
       context 'json形式' do\r
         it 'ステータスコード200 OKを返す' do\r
-#          Panel.any_instance.stub(:save).and_return(true)\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+#          Panel.any_instance.stub(:store).and_return(true)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           response.should be_success \r
         end\r
         it '作成されたコマをjsonデータで返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           lambda{JSON.parse(response.body)}.should_not raise_error(JSON::ParserError)\r
         end\r
         it 'データがアレになっている' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           json = JSON.parse response.body\r
-          json["title"].should match(/normal/)\r
+          json["width"].should eq @panel.width\r
         end\r
       end\r
     end\r
@@ -359,21 +359,21 @@ describe PanelsController do
       end\r
       context 'html形式' do\r
         it 'ステータスコード302 Foundを返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.status.should eq 302\r
         end\r
         it 'サインインページへ遷移する' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.body.should redirect_to '/users/sign_in'\r
         end\r
       end\r
       context 'json形式' do\r
         it 'ステータスコード401 Unauthorizedを返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           response.status.should eq 401\r
         end\r
         it '応答メッセージにUnauthorizedを返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           response.message.should match(/Unauthorized/)\r
         end\r
       end\r
@@ -383,26 +383,26 @@ describe PanelsController do
         Panel.any_instance.stub(:save).and_return(false)\r
       end\r
       it "未保存のコマを保持している" do\r
-        post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+        post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
         assigns(:panel).should be_a_new(Panel)\r
       end\r
       context 'html形式' do\r
         it 'ステータスコード200 OKを返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.status.should eq 200\r
         end\r
         it '新規ページを描画する' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id)\r
           response.should render_template("new")\r
         end\r
       end\r
       context 'json形式' do\r
         it 'ステータスコード422 unprocessable_entity を返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           response.status.should eq 422\r
         end\r
         it '応答メッセージUnprocessable Entityを返す' do\r
-          post :create, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
+          post :create, :panel => Factory.attributes_for(:panel, :author_id => @author.id), :format => :json\r
           response.message.should match(/Unprocessable/)\r
         end\r
       end\r
@@ -468,102 +468,4 @@ describe PanelsController do
     end\r
   end\r
 \r
-  describe '更新に於いて' do\r
-    before do\r
-      @panel = Factory :panel, :author => @author.id, :comic_id => @comic.id\r
-      sign_in @user\r
-    end\r
-    context '事前チェックしておく' do\r
-      it 'コマモデルに単体取得を問い合わせている' do\r
-        Panel.stub(:show).with(any_args()).and_return @panel\r
-        Panel.should_receive(:show).exactly(1)\r
-        put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-      end\r
-      it 'モデルに更新を依頼する' do\r
-        Panel.any_instance.should_receive(:update_attributes).with(any_args)\r
-        put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-      end\r
-      it '@panelにアレを取得している' do\r
-        put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-        assigns(:panel).id.should eq(@panel.id)\r
-      end\r
-    end\r
-    context 'つつがなく終わるとき' do\r
-      it '更新される' do\r
-        put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-        Panel.find(@panel.id).visible.should eq 0\r
-      end\r
-      context 'html形式' do\r
-        it 'ステータスコード302 Foundを返す' do\r
-          Panel.any_instance.stub(:update_attributes).with(any_args()).and_return(true)\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-          response.status.should eq 302\r
-        end\r
-        it '更新されたコマの表示ページへ遷移する' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-          response.should redirect_to(@panel)\r
-        end\r
-      end\r
-      context 'json形式' do\r
-        it 'ステータスコード200 OKを返す' do\r
-          Panel.any_instance.stub(:update_attributes).with(any_args()).and_return(true)\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
-          response.should be_success \r
-        end\r
-        it 'ページ本体は特に返さない' do\r
-          Panel.any_instance.stub(:update_attributes).with(any_args()).and_return(true)\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
-          response.body.should match /./\r
-        end\r
-      end\r
-    end\r
-    context '作家権限がないとき' do\r
-      before do\r
-        sign_out @user\r
-      end\r
-      it 'ステータスコード302 Foundを返す' do\r
-        put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-        response.status.should eq 302\r
-      end\r
-      context 'html形式' do\r
-        it 'サインインページへ遷移する' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-          response.body.should redirect_to '/users/sign_in'\r
-        end\r
-      end\r
-      context 'json形式' do\r
-        it '応答メッセージにUnauthorizedを返す' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
-          response.message.should match(/Unauthorized/)\r
-        end\r
-      end\r
-    end\r
-    context '検証、保存に失敗したとき' do\r
-      before do\r
-        Panel.any_instance.stub(:update_attributes).and_return(false)\r
-      end\r
-      context 'html形式' do\r
-        it 'ステータスコード200 Okを返す' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-          response.status.should eq 200\r
-        end\r
-        it '編集ページを描画する' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id)\r
-          response.should render_template("edit")\r
-        end\r
-      end\r
-      context 'json形式' do\r
-        it 'ステータスコード422 unprocessable_entity を返す' do\r
-          Panel.any_instance.stub(:update_attributes).and_return(false)\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
-          response.status.should eq 422\r
-        end\r
-        it '応答メッセージUnprocessable Entityを返す' do\r
-          put :update, :id => @panel.id, :panel => Factory.attributes_for(:panel, :author => @author.id), :format => :json\r
-          response.message.should match(/Unprocessable/)\r
-        end\r
-      end\r
-    end\r
-  end\r
-  \r
 end\r