enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/controllers/picture_files_controller_spec.rb

@@ -11,7 +11,7 @@ describe PictureFilesController do
 
       it "assigns all picture_files as @picture_files" do
         get :index
-        assigns(:picture_files).should eq(PictureFile.all)
+        expect(assigns(:picture_files)).to eq(PictureFile.all)
       end
     end
 
@@ -20,7 +20,7 @@ describe PictureFilesController do
 
       it "assigns all picture_files as @picture_files" do
         get :index
-        assigns(:picture_files).should eq(PictureFile.all)
+        expect(assigns(:picture_files)).to eq(PictureFile.all)
       end
     end
 
@@ -29,14 +29,14 @@ describe PictureFilesController do
 
       it "assigns all picture_files as @picture_files" do
         get :index
-        assigns(:picture_files).should eq(PictureFile.all)
+        expect(assigns(:picture_files)).to eq(PictureFile.all)
       end
     end
 
     describe "When not logged in" do
       it "assigns all picture_files as @picture_files" do
         get :index
-        assigns(:picture_files).should eq(PictureFile.all)
+        expect(assigns(:picture_files)).to eq(PictureFile.all)
       end
     end
   end
@@ -48,7 +48,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :show, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
 
@@ -58,7 +58,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :show, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
 
@@ -68,7 +68,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :show, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
 
@@ -76,7 +76,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :show, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
   end
@@ -87,8 +87,8 @@ describe PictureFilesController do
 
       it "assigns the requested picture_file as @picture_file" do
         get :new
-        assigns(:picture_file).should_not be_valid
-        response.should redirect_to picture_files_url
+        expect(assigns(:picture_file)).not_to be_valid
+        expect(response).to redirect_to picture_files_url
       end
     end
 
@@ -97,8 +97,8 @@ describe PictureFilesController do
 
       it "assigns the requested picture_file as @picture_file" do
         get :new
-        assigns(:picture_file).should_not be_valid
-        response.should redirect_to picture_files_url
+        expect(assigns(:picture_file)).not_to be_valid
+        expect(response).to redirect_to picture_files_url
       end
     end
 
@@ -107,16 +107,16 @@ describe PictureFilesController do
 
       it "should not assign the requested picture_file as @picture_file" do
         get :new
-        assigns(:picture_file).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:picture_file)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested picture_file as @picture_file" do
         get :new
-        assigns(:picture_file).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:picture_file)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -128,7 +128,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :edit, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
 
@@ -138,7 +138,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :edit, :id => picture_file.id
-        assigns(:picture_file).should eq(picture_file)
+        expect(assigns(:picture_file)).to eq(picture_file)
       end
     end
 
@@ -148,7 +148,7 @@ describe PictureFilesController do
       it "assigns the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :edit, :id => picture_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -156,7 +156,7 @@ describe PictureFilesController do
       it "should not assign the requested picture_file as @picture_file" do
         picture_file = PictureFile.find(1)
         get :edit, :id => picture_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -173,24 +173,24 @@ describe PictureFilesController do
       describe "with valid params" do
         it "assigns a newly created picture_file as @picture_file" do
           post :create, :picture_file => @attrs
-          assigns(:picture_file).should be_valid
+          expect(assigns(:picture_file)).to be_valid
         end
 
         it "redirects to the created picture_file" do
           post :create, :picture_file => @attrs
-          response.should redirect_to(picture_file_url(assigns(:picture_file)))
+          expect(response).to redirect_to(picture_file_url(assigns(:picture_file)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved picture_file as @picture_file" do
           post :create, :picture_file => @invalid_attrs
-          assigns(:picture_file).should_not be_valid
+          expect(assigns(:picture_file)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :picture_file => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -201,24 +201,24 @@ describe PictureFilesController do
       describe "with valid params" do
         it "assigns a newly created picture_file as @picture_file" do
           post :create, :picture_file => @attrs
-          assigns(:picture_file).should be_valid
+          expect(assigns(:picture_file)).to be_valid
         end
 
         it "redirects to the created picture_file" do
           post :create, :picture_file => @attrs
-          response.should redirect_to(picture_file_url(assigns(:picture_file)))
+          expect(response).to redirect_to(picture_file_url(assigns(:picture_file)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved picture_file as @picture_file" do
           post :create, :picture_file => @invalid_attrs
-          assigns(:picture_file).should_not be_valid
+          expect(assigns(:picture_file)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :picture_file => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -229,24 +229,24 @@ describe PictureFilesController do
       describe "with valid params" do
         it "assigns a newly created picture_file as @picture_file" do
           post :create, :picture_file => @attrs
-          assigns(:picture_file).should be_valid
+          expect(assigns(:picture_file)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :picture_file => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved picture_file as @picture_file" do
           post :create, :picture_file => @invalid_attrs
-          assigns(:picture_file).should_not be_valid
+          expect(assigns(:picture_file)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :picture_file => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -255,24 +255,24 @@ describe PictureFilesController do
       describe "with valid params" do
         it "assigns a newly created picture_file as @picture_file" do
           post :create, :picture_file => @attrs
-          assigns(:picture_file).should be_valid
+          expect(assigns(:picture_file)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :picture_file => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved picture_file as @picture_file" do
           post :create, :picture_file => @invalid_attrs
-          assigns(:picture_file).should_not be_valid
+          expect(assigns(:picture_file)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :picture_file => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -295,19 +295,19 @@ describe PictureFilesController do
 
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @attrs
-          assigns(:picture_file).should eq(@picture_file)
+          expect(assigns(:picture_file)).to eq(@picture_file)
         end
 
         it "moves its position when specified" do
           put :update, :id => @picture_file.id, :move => 'lower'
-          response.should redirect_to(shelf_picture_files_url(@picture_file.picture_attachable))
+          expect(response).to redirect_to(picture_files_url(shelf_id: @picture_file.picture_attachable_id))
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -322,20 +322,20 @@ describe PictureFilesController do
 
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @attrs
-          assigns(:picture_file).should eq(@picture_file)
-          response.should redirect_to(@picture_file)
+          expect(assigns(:picture_file)).to eq(@picture_file)
+          expect(response).to redirect_to(@picture_file)
         end
       end
 
       describe "with invalid params" do
         it "assigns the picture_file as @picture_file" do
           put :update, :id => @picture_file, :picture_file => @invalid_attrs
-          assigns(:picture_file).should_not be_valid
+          expect(assigns(:picture_file)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @picture_file, :picture_file => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -350,15 +350,15 @@ describe PictureFilesController do
 
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @attrs
-          assigns(:picture_file).should eq(@picture_file)
-          response.should be_forbidden
+          expect(assigns(:picture_file)).to eq(@picture_file)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -371,14 +371,14 @@ describe PictureFilesController do
 
         it "should be forbidden" do
           put :update, :id => @picture_file.id, :picture_file => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested picture_file as @picture_file" do
           put :update, :id => @picture_file.id, :picture_file => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -398,7 +398,7 @@ describe PictureFilesController do
 
       it "redirects to the picture_files list" do
         delete :destroy, :id => @picture_file.id
-        response.should redirect_to(picture_files_url)
+        expect(response).to redirect_to(picture_files_url(shelf_id: @picture_file.picture_attachable_id))
       end
     end
 
@@ -411,7 +411,7 @@ describe PictureFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @picture_file.id
-        response.should redirect_to(picture_files_url)
+        expect(response).to redirect_to(picture_files_url(shelf_id: @picture_file.picture_attachable_id))
       end
     end
 
@@ -424,7 +424,7 @@ describe PictureFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @picture_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -435,7 +435,7 @@ describe PictureFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @picture_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/produce_types_controller_spec.rb

@@ -33,7 +33,7 @@ describe ProduceTypesController do
     it "assigns all produce_types as @produce_types" do
       produce_type = ProduceType.create! valid_attributes
       get :index
-      assigns(:produce_types).should eq(ProduceType.all)
+      expect(assigns(:produce_types)).to eq(ProduceType.all)
     end
   end
 
@@ -41,14 +41,14 @@ describe ProduceTypesController do
     it "assigns the requested produce_type as @produce_type" do
       produce_type = ProduceType.create! valid_attributes
       get :show, :id => produce_type.id
-      assigns(:produce_type).should eq(produce_type)
+      expect(assigns(:produce_type)).to eq(produce_type)
     end
   end
 
   describe "GET new" do
     it "assigns a new produce_type as @produce_type" do
       get :new
-      assigns(:produce_type).should be_a_new(ProduceType)
+      expect(assigns(:produce_type)).to be_a_new(ProduceType)
     end
   end
 
@@ -56,7 +56,7 @@ describe ProduceTypesController do
     it "assigns the requested produce_type as @produce_type" do
       produce_type = ProduceType.create! valid_attributes
       get :edit, :id => produce_type.id
-      assigns(:produce_type).should eq(produce_type)
+      expect(assigns(:produce_type)).to eq(produce_type)
     end
   end
 
@@ -70,13 +70,13 @@ describe ProduceTypesController do
 
       it "assigns a newly created produce_type as @produce_type" do
         post :create, :produce_type => valid_attributes
-        assigns(:produce_type).should be_a(ProduceType)
-        assigns(:produce_type).should be_persisted
+        expect(assigns(:produce_type)).to be_a(ProduceType)
+        expect(assigns(:produce_type)).to be_persisted
       end
 
       it "redirects to the created produce_type" do
         post :create, :produce_type => valid_attributes
-        response.should redirect_to(ProduceType.last)
+        expect(response).to redirect_to(ProduceType.last)
       end
     end
 
@@ -85,14 +85,14 @@ describe ProduceTypesController do
         # Trigger the behavior that occurs when invalid params are submitted
         ProduceType.any_instance.stub(:save).and_return(false)
         post :create, :produce_type => {}
-        assigns(:produce_type).should be_a_new(ProduceType)
+        expect(assigns(:produce_type)).to be_a_new(ProduceType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         ProduceType.any_instance.stub(:save).and_return(false)
         post :create, :produce_type => {}
-        #response.should render_template("new")
+        #expect(response).to render_template("new")
       end
     end
   end
@@ -112,20 +112,20 @@ describe ProduceTypesController do
       it "assigns the requested produce_type as @produce_type" do
         produce_type = ProduceType.create! valid_attributes
         put :update, :id => produce_type.id, :produce_type => valid_attributes
-        assigns(:produce_type).should eq(produce_type)
+        expect(assigns(:produce_type)).to eq(produce_type)
       end
 
       it "redirects to the produce_type" do
         produce_type = ProduceType.create! valid_attributes
         put :update, :id => produce_type.id, :produce_type => valid_attributes
-        response.should redirect_to(produce_type)
+        expect(response).to redirect_to(produce_type)
       end
 
       it "moves its position when specified" do
         produce_type = ProduceType.create! valid_attributes
         position = produce_type.position
         put :update, :id => produce_type.id, :move => 'higher'
-        response.should redirect_to produce_types_url
+        expect(response).to redirect_to produce_types_url
         assigns(:produce_type).position.should eq position - 1
       end
     end
@@ -136,7 +136,7 @@ describe ProduceTypesController do
         # Trigger the behavior that occurs when invalid params are submitted
         ProduceType.any_instance.stub(:save).and_return(false)
         put :update, :id => produce_type.id, :produce_type => {}
-        assigns(:produce_type).should eq(produce_type)
+        expect(assigns(:produce_type)).to eq(produce_type)
       end
 
       it "re-renders the 'edit' template" do
@@ -144,7 +144,7 @@ describe ProduceTypesController do
         # Trigger the behavior that occurs when invalid params are submitted
         ProduceType.any_instance.stub(:save).and_return(false)
         put :update, :id => produce_type.id, :produce_type => {}
-        #response.should render_template("edit")
+        #expect(response).to render_template("edit")
       end
     end
   end
@@ -160,7 +160,7 @@ describe ProduceTypesController do
     it "redirects to the produce_types list" do
       produce_type = ProduceType.create! valid_attributes
       delete :destroy, :id => produce_type.id
-      response.should redirect_to(produce_types_url)
+      expect(response).to redirect_to(produce_types_url)
     end
   end