enju_subject 0.1.0.pre26 → 0.1.0.pre27

data/spec/controllers/classification_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        assigns(:classification_types).should eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.all)
       end
     end
 
@@ -28,7 +28,7 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        assigns(:classification_types).should eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.all)
       end
     end
 
@@ -37,14 +37,14 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        assigns(:classification_types).should eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.all)
       end
     end
 
     describe "When not logged in" do
       it "assigns all classification_types as @classification_types" do
         get :index
-        assigns(:classification_types).should eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.all)
       end
     end
   end
@@ -56,7 +56,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :show, :id => classification_type.id
-        assigns(:classification_type).should eq(classification_type)
+        expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
 
@@ -66,7 +66,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :show, :id => classification_type.id
-        assigns(:classification_type).should eq(classification_type)
+        expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
 
@@ -76,7 +76,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :show, :id => classification_type.id
-        assigns(:classification_type).should eq(classification_type)
+        expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
 
@@ -84,7 +84,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :show, :id => classification_type.id
-        assigns(:classification_type).should eq(classification_type)
+        expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
   end
@@ -95,8 +95,8 @@ describe ClassificationTypesController do
 
       it "assigns the requested classification_type as @classification_type" do
         get :new
-        assigns(:classification_type).should_not be_valid
-        response.should be_success
+        expect(assigns(:classification_type)).not_to be_valid
+        expect(response).to be_success
       end
     end
 
@@ -105,8 +105,8 @@ describe ClassificationTypesController do
 
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        assigns(:classification_type).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:classification_type)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
@@ -115,16 +115,16 @@ describe ClassificationTypesController do
 
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        assigns(:classification_type).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:classification_type)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        assigns(:classification_type).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:classification_type)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -136,7 +136,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :edit, :id => classification_type.id
-        assigns(:classification_type).should eq(classification_type)
+        expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
 
@@ -146,7 +146,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :edit, :id => classification_type.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -156,7 +156,7 @@ describe ClassificationTypesController do
       it "assigns the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :edit, :id => classification_type.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -164,7 +164,7 @@ describe ClassificationTypesController do
       it "should not assign the requested classification_type as @classification_type" do
         classification_type = FactoryGirl.create(:classification_type)
         get :edit, :id => classification_type.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -181,24 +181,24 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          assigns(:classification_type).should be_valid
+          expect(assigns(:classification_type)).to be_valid
         end
 
         it "redirects to the created agent" do
           post :create, :classification_type => @attrs
-          response.should redirect_to(assigns(:classification_type))
+          expect(response).to redirect_to(assigns(:classification_type))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          assigns(:classification_type).should_not be_valid
+          expect(assigns(:classification_type)).not_to be_valid
         end
 
         it "should be successful" do
           post :create, :classification_type => @invalid_attrs
-          response.should be_success
+          expect(response).to be_success
         end
       end
     end
@@ -209,24 +209,24 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          assigns(:classification_type).should be_valid
+          expect(assigns(:classification_type)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          assigns(:classification_type).should_not be_valid
+          expect(assigns(:classification_type)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -237,24 +237,24 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          assigns(:classification_type).should be_valid
+          expect(assigns(:classification_type)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          assigns(:classification_type).should_not be_valid
+          expect(assigns(:classification_type)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -263,24 +263,24 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          assigns(:classification_type).should be_valid
+          expect(assigns(:classification_type)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @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 classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          assigns(:classification_type).should_not be_valid
+          expect(assigns(:classification_type)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :classification_type => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -303,19 +303,19 @@ describe ClassificationTypesController do
 
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @attrs
-          assigns(:classification_type).should eq(@classification_type)
+          expect(assigns(:classification_type)).to eq(@classification_type)
         end
 
         it "moves its position when specified" do
           put :update, :id => @classification_type.id, :classification_type => @attrs, :move => 'lower'
-          response.should redirect_to(classification_types_url)
+          expect(response).to redirect_to(classification_types_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -330,15 +330,15 @@ describe ClassificationTypesController do
 
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @attrs
-          assigns(:classification_type).should eq(@classification_type)
-          response.should be_forbidden
+          expect(assigns(:classification_type)).to eq(@classification_type)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -353,15 +353,15 @@ describe ClassificationTypesController do
 
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @attrs
-          assigns(:classification_type).should eq(@classification_type)
-          response.should be_forbidden
+          expect(assigns(:classification_type)).to eq(@classification_type)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -374,14 +374,14 @@ describe ClassificationTypesController do
 
         it "should be forbidden" do
           put :update, :id => @classification_type.id, :classification_type => @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 classification_type as @classification_type" do
           put :update, :id => @classification_type.id, :classification_type => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -401,7 +401,7 @@ describe ClassificationTypesController do
 
       it "redirects to the classification_types list" do
         delete :destroy, :id => @classification_type.id
-        response.should redirect_to(classification_types_url)
+        expect(response).to redirect_to(classification_types_url)
       end
     end
 
@@ -414,7 +414,7 @@ describe ClassificationTypesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @classification_type.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -427,7 +427,7 @@ describe ClassificationTypesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @classification_type.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -438,7 +438,7 @@ describe ClassificationTypesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @classification_type.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/classifications_controller_spec.rb

@@ -17,7 +17,7 @@ describe ClassificationsController do
 
       it "assigns all classifications as @classifications" do
         get :index
-        assigns(:classifications).should_not be_empty
+        expect(assigns(:classifications)).not_to be_empty
       end
     end
 
@@ -26,7 +26,7 @@ describe ClassificationsController do
 
       it "assigns all classifications as @classifications" do
         get :index
-        assigns(:classifications).should_not be_empty
+        expect(assigns(:classifications)).not_to be_empty
       end
     end
 
@@ -35,20 +35,20 @@ describe ClassificationsController do
 
       it "assigns all classifications as @classifications" do
         get :index
-        assigns(:classifications).should_not be_empty
+        expect(assigns(:classifications)).not_to be_empty
       end
     end
 
     describe "When not logged in" do
       it "assigns all classifications as @classifications" do
         get :index
-        assigns(:classifications).should_not be_empty
+        expect(assigns(:classifications)).not_to be_empty
       end
 
       it "should get index with query" do
         get :index, :query => '500'
         response.should be_success
-        assigns(:classifications).should_not be_empty
+        expect(assigns(:classifications)).not_to be_empty
       end
     end
   end
@@ -63,7 +63,7 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :show, :id => @classification.id
-        assigns(:classification).should eq(@classification)
+        expect(assigns(:classification)).to eq(@classification)
       end
     end
 
@@ -72,7 +72,7 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :show, :id => @classification.id
-        assigns(:classification).should eq(@classification)
+        expect(assigns(:classification)).to eq(@classification)
       end
     end
 
@@ -81,14 +81,14 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :show, :id => @classification.id
-        assigns(:classification).should eq(@classification)
+        expect(assigns(:classification)).to eq(@classification)
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested classification as @classification" do
         get :show, :id => @classification.id
-        assigns(:classification).should eq(@classification)
+        expect(assigns(:classification)).to eq(@classification)
       end
     end
   end
@@ -99,7 +99,7 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :new
-        assigns(:classification).should_not be_valid
+        expect(assigns(:classification)).not_to be_valid
       end
     end
 
@@ -108,7 +108,7 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :new
-        assigns(:classification).should_not be_valid
+        expect(assigns(:classification)).not_to be_valid
       end
     end
 
@@ -117,14 +117,14 @@ describe ClassificationsController do
 
       it "should assign the requested classification as @classification" do
         get :new
-        assigns(:classification).should_not be_valid
+        expect(assigns(:classification)).not_to be_valid
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested classification as @classification" do
         get :new
-        assigns(:classification).should_not be_valid
+        expect(assigns(:classification)).not_to be_valid
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -137,7 +137,7 @@ describe ClassificationsController do
       it "assigns the requested classification as @classification" do
         classification = FactoryGirl.create(:classification)
         get :edit, :id => classification.id
-        assigns(:classification).should eq(classification)
+        expect(assigns(:classification)).to eq(classification)
       end
     end
 
@@ -147,7 +147,7 @@ describe ClassificationsController do
       it "assigns the requested classification as @classification" do
         classification = FactoryGirl.create(:classification)
         get :edit, :id => classification.id
-        assigns(:classification).should eq(classification)
+        expect(assigns(:classification)).to eq(classification)
       end
     end
 
@@ -182,7 +182,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          assigns(:classification).should be_valid
+          expect(assigns(:classification)).to be_valid
         end
 
         it "redirects to the created classification" do
@@ -194,7 +194,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          assigns(:classification).should_not be_valid
+          expect(assigns(:classification)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
@@ -210,7 +210,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          assigns(:classification).should be_valid
+          expect(assigns(:classification)).to be_valid
         end
 
         it "should be forbidden" do
@@ -222,7 +222,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          assigns(:classification).should_not be_valid
+          expect(assigns(:classification)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -238,7 +238,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          assigns(:classification).should be_valid
+          expect(assigns(:classification)).to be_valid
         end
 
         it "should be forbidden" do
@@ -250,7 +250,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          assigns(:classification).should_not be_valid
+          expect(assigns(:classification)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -264,7 +264,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          assigns(:classification).should be_valid
+          expect(assigns(:classification)).to be_valid
         end
 
         it "should be forbidden" do
@@ -276,7 +276,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          assigns(:classification).should_not be_valid
+          expect(assigns(:classification)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -304,7 +304,7 @@ describe ClassificationsController do
 
         it "assigns the requested classification as @classification" do
           put :update, :id => @classification.id, :classification => @attrs
-          assigns(:classification).should eq(@classification)
+          expect(assigns(:classification)).to eq(@classification)
         end
       end
 
@@ -326,7 +326,7 @@ describe ClassificationsController do
 
         it "should be forbidden" do
           put :update, :id => @classification.id, :classification => @attrs
-          assigns(:classification).should eq(@classification)
+          expect(assigns(:classification)).to eq(@classification)
           response.should be_forbidden
         end
       end
@@ -349,7 +349,7 @@ describe ClassificationsController do
 
         it "assigns the requested classification as @classification" do
           put :update, :id => @classification.id, :classification => @attrs
-          assigns(:classification).should eq(@classification)
+          expect(assigns(:classification)).to eq(@classification)
           response.should be_forbidden
         end
       end