enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/controllers/identifier_types_controller_spec.rb

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

data/spec/controllers/import_requests_controller_spec.rb

@@ -11,7 +11,7 @@ describe ImportRequestsController do
 
       it "assigns all import_requests as @import_requests" do
         get :index
-        assigns(:import_requests).should eq(ImportRequest.all)
+        expect(assigns(:import_requests)).to eq(ImportRequest.all)
       end
     end
 
@@ -20,7 +20,7 @@ describe ImportRequestsController do
 
       it "assigns all import_requests as @import_requests" do
         get :index
-        assigns(:import_requests).should eq(ImportRequest.all)
+        expect(assigns(:import_requests)).to eq(ImportRequest.all)
       end
     end
 
@@ -29,14 +29,14 @@ describe ImportRequestsController do
 
       it "assigns empty as @import_requests" do
         get :index
-        assigns(:import_requests).should be_empty
+        expect(assigns(:import_requests)).to be_empty
       end
     end
 
     describe "When not logged in" do
       it "assigns empty as @import_requests" do
         get :index
-        assigns(:import_requests).should be_empty
+        expect(assigns(:import_requests)).to be_empty
       end
     end
   end
@@ -48,7 +48,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = import_requests(:one)
         get :show, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
 
@@ -58,7 +58,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = import_requests(:one)
         get :show, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
 
@@ -68,7 +68,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = import_requests(:one)
         get :show, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
 
@@ -76,7 +76,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = import_requests(:one)
         get :show, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
   end
@@ -87,7 +87,7 @@ describe ImportRequestsController do
 
       it "assigns the requested import_request as @import_request" do
         get :new
-        assigns(:import_request).should_not be_valid
+        expect(assigns(:import_request)).to_not be_valid
       end
     end
 
@@ -96,7 +96,7 @@ describe ImportRequestsController do
 
       it "assigns the requested import_request as @import_request" do
         get :new
-        assigns(:import_request).should_not be_valid
+        expect(assigns(:import_request)).to_not be_valid
       end
     end
 
@@ -105,16 +105,16 @@ describe ImportRequestsController do
 
       it "should not assign the requested import_request as @import_request" do
         get :new
-        assigns(:import_request).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:import_request)).to_not be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested import_request as @import_request" do
         get :new
-        assigns(:import_request).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:import_request)).to_not be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -126,7 +126,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = FactoryGirl.create(:import_request, :isbn => '9784797350999')
         get :edit, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
 
@@ -136,7 +136,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = FactoryGirl.create(:import_request, :isbn => '9784797350999')
         get :edit, :id => import_request.id
-        assigns(:import_request).should eq(import_request)
+        expect(assigns(:import_request)).to eq(import_request)
       end
     end
 
@@ -146,7 +146,7 @@ describe ImportRequestsController do
       it "assigns the requested import_request as @import_request" do
         import_request = FactoryGirl.create(:import_request, :isbn => '9784797350999')
         get :edit, :id => import_request.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -154,7 +154,7 @@ describe ImportRequestsController do
       it "should not assign the requested import_request as @import_request" do
         import_request = FactoryGirl.create(:import_request, :isbn => '9784797350999')
         get :edit, :id => import_request.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -176,31 +176,31 @@ describe ImportRequestsController do
 
         it "redirects to the created import_request" do
           post :create, :import_request => @attrs
-          response.should redirect_to manifestation_url(assigns(:import_request).manifestation)
+          expect(response).to redirect_to manifestation_url(assigns(:import_request).manifestation)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved import_request as @import_request" do
           post :create, :import_request => @invalid_attrs
-          assigns(:import_request).should_not be_valid
+          expect(assigns(:import_request)).to_not be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :import_request => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
 
       describe "with isbn which is already imported" do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => {:isbn => manifestations(:manifestation_00001).identifier_contents(:isbn).first}
-          assigns(:import_request).should be_valid
+          expect(assigns(:import_request)).to be_valid
         end
 
         it "redirects to the created import_request", :vcr => true do
           post :create, :import_request => @attrs
-          response.should redirect_to manifestation_url(assigns(:import_request).manifestation)
+          expect(response).to redirect_to manifestation_url(assigns(:import_request).manifestation)
         end
       end
     end
@@ -211,24 +211,24 @@ describe ImportRequestsController do
       describe "with valid params", :vcr => true do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => @attrs
-          assigns(:import_request).should be_valid
+          expect(assigns(:import_request)).to be_valid
         end
 
         it "redirects to the created import_request" do
           post :create, :import_request => @attrs
-          response.should redirect_to manifestation_url(assigns(:import_request).manifestation)
+          expect(response).to redirect_to manifestation_url(assigns(:import_request).manifestation)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved import_request as @import_request" do
           post :create, :import_request => @invalid_attrs
-          assigns(:import_request).should_not be_valid
+          expect(assigns(:import_request)).to_not be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :import_request => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -239,24 +239,24 @@ describe ImportRequestsController do
       describe "with valid params" do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => @attrs
-          assigns(:import_request).should be_valid
+          expect(assigns(:import_request)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :import_request => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved import_request as @import_request" do
           post :create, :import_request => @invalid_attrs
-          assigns(:import_request).should_not be_valid
+          expect(assigns(:import_request)).to_not be_valid
         end
 
         it "should be forbidden" do
           post :create, :import_request => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -265,24 +265,24 @@ describe ImportRequestsController do
       describe "with valid params" do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => @attrs
-          assigns(:import_request).should be_valid
+          expect(assigns(:import_request)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :import_request => @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 import_request as @import_request" do
           post :create, :import_request => @invalid_attrs
-          assigns(:import_request).should_not be_valid
+          expect(assigns(:import_request)).to_not be_valid
         end
 
         it "should be forbidden" do
           post :create, :import_request => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -305,14 +305,14 @@ describe ImportRequestsController do
 
         it "assigns the requested import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @attrs
-          assigns(:import_request).should eq(@import_request)
+          expect(assigns(:import_request)).to eq(@import_request)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -327,20 +327,20 @@ describe ImportRequestsController do
 
         it "assigns the requested import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @attrs
-          assigns(:import_request).should eq(@import_request)
-          response.should redirect_to(@import_request)
+          expect(assigns(:import_request)).to eq(@import_request)
+          expect(response).to redirect_to(@import_request)
         end
       end
 
       describe "with invalid params" do
         it "assigns the import_request as @import_request" do
           put :update, :id => @import_request, :import_request => @invalid_attrs
-          assigns(:import_request).should_not be_valid
+          expect(assigns(:import_request)).to_not be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @import_request, :import_request => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -355,15 +355,15 @@ describe ImportRequestsController do
 
         it "assigns the requested import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @attrs
-          assigns(:import_request).should eq(@import_request)
-          response.should be_forbidden
+          expect(assigns(:import_request)).to eq(@import_request)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -376,14 +376,14 @@ describe ImportRequestsController do
 
         it "should be redirected to new session url" do
           put :update, :id => @import_request.id, :import_request => @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 import_request as @import_request" do
           put :update, :id => @import_request.id, :import_request => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -403,7 +403,7 @@ describe ImportRequestsController do
 
       it "redirects to the import_requests list" do
         delete :destroy, :id => @import_request.id
-        response.should redirect_to(import_requests_url)
+        expect(response).to redirect_to(import_requests_url)
       end
     end
 
@@ -416,7 +416,7 @@ describe ImportRequestsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @import_request.id
-        response.should redirect_to(import_requests_url)
+        expect(response).to redirect_to(import_requests_url)
       end
     end
 
@@ -429,7 +429,7 @@ describe ImportRequestsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @import_request.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -440,7 +440,7 @@ describe ImportRequestsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @import_request.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end