enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/controllers/carrier_types_controller_spec.rb

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

data/spec/controllers/content_types_controller_spec.rb

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

data/spec/controllers/countries_controller_spec.rb

@@ -96,7 +96,7 @@ describe CountriesController do
       it "assigns the requested country as @country" do
         get :new
         assigns(:country).should_not be_valid
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
@@ -106,7 +106,7 @@ describe CountriesController do
       it "assigns the requested country as @country" do
         get :new
         assigns(:country).should_not be_valid
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -116,7 +116,7 @@ describe CountriesController do
       it "assigns the requested country as @country" do
         get :new
         assigns(:country).should_not be_valid
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -124,7 +124,7 @@ describe CountriesController do
       it "should not assign the requested country as @country" do
         get :new
         assigns(:country).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -164,7 +164,7 @@ describe CountriesController do
       it "should not assign the requested country as @country" do
         country = FactoryGirl.create(:country)
         get :edit, :id => country.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -186,7 +186,7 @@ describe CountriesController do
 
         it "redirects to the created country" do
           post :create, :country => @attrs
-          response.should redirect_to(assigns(:country))
+          expect(response).to redirect_to(assigns(:country))
         end
       end
 
@@ -198,7 +198,7 @@ describe CountriesController do
 
         it "re-renders the 'new' template" do
           post :create, :country => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -214,7 +214,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
@@ -226,7 +226,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -242,7 +242,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
@@ -254,7 +254,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -268,7 +268,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
@@ -280,7 +280,7 @@ describe CountriesController do
 
         it "should be forbidden" do
           post :create, :country => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -308,14 +308,14 @@ describe CountriesController do
 
         it "moves its position when specified" do
           put :update, :id => @country.id, :country => @attrs, :move => 'lower'
-          response.should redirect_to(countries_url)
+          expect(response).to redirect_to(countries_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested country as @country" do
           put :update, :id => @country.id, :country => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -335,14 +335,14 @@ describe CountriesController do
 
         it "moves its position when specified" do
           put :update, :id => @country.id, :country => @attrs, :move => 'lower'
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested country as @country" do
           put :update, :id => @country.id, :country => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -362,14 +362,14 @@ describe CountriesController do
 
         it "moves its position when specified" do
           put :update, :id => @country.id, :country => @attrs, :move => 'lower'
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested country as @country" do
           put :update, :id => @country.id, :country => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -382,14 +382,14 @@ describe CountriesController do
 
         it "should be forbidden" do
           put :update, :id => @country.id, :country => @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 country as @country" do
           put :update, :id => @country.id, :country => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -409,7 +409,7 @@ describe CountriesController do
 
       it "redirects to the countries list" do
         delete :destroy, :id => @country.id
-        response.should redirect_to(countries_url)
+        expect(response).to redirect_to(countries_url)
       end
     end
 
@@ -422,7 +422,7 @@ describe CountriesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @country.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -435,7 +435,7 @@ describe CountriesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @country.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -446,7 +446,7 @@ describe CountriesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @country.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/create_types_controller_spec.rb

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