enju_subject 0.1.0.pre26 → 0.1.0.pre27

data/spec/controllers/subject_heading_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        assigns(:subject_heading_types).should eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
       end
     end
 
@@ -28,7 +28,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        assigns(:subject_heading_types).should eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
       end
     end
 
@@ -37,14 +37,14 @@ describe SubjectHeadingTypesController do
 
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        assigns(:subject_heading_types).should eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
       end
     end
 
     describe "When not logged in" do
       it "assigns all subject_heading_types as @subject_heading_types" do
         get :index
-        assigns(:subject_heading_types).should eq(SubjectHeadingType.all)
+        expect(assigns(:subject_heading_types)).to eq(SubjectHeadingType.all)
       end
     end
   end
@@ -56,7 +56,7 @@ describe SubjectHeadingTypesController do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
         get :show, :id => subject_heading_type.id
-        assigns(:subject_heading_type).should eq(subject_heading_type)
+        expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
 
@@ -66,7 +66,7 @@ describe SubjectHeadingTypesController do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
         get :show, :id => subject_heading_type.id
-        assigns(:subject_heading_type).should eq(subject_heading_type)
+        expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
 
@@ -76,7 +76,7 @@ describe SubjectHeadingTypesController do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
         get :show, :id => subject_heading_type.id
-        assigns(:subject_heading_type).should eq(subject_heading_type)
+        expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
 
@@ -84,7 +84,7 @@ describe SubjectHeadingTypesController do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
         get :show, :id => subject_heading_type.id
-        assigns(:subject_heading_type).should eq(subject_heading_type)
+        expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
   end
@@ -95,7 +95,7 @@ describe SubjectHeadingTypesController do
 
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         get :new
-        assigns(:subject_heading_type).should_not be_valid
+        expect(assigns(:subject_heading_type)).not_to be_valid
         response.should be_success
       end
     end
@@ -105,7 +105,7 @@ describe SubjectHeadingTypesController do
 
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        assigns(:subject_heading_type).should_not be_valid
+        expect(assigns(:subject_heading_type)).not_to be_valid
         response.should be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe SubjectHeadingTypesController do
 
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        assigns(:subject_heading_type).should_not be_valid
+        expect(assigns(:subject_heading_type)).not_to be_valid
         response.should be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe SubjectHeadingTypesController do
     describe "When not logged in" do
       it "should not assign the requested subject_heading_type as @subject_heading_type" do
         get :new
-        assigns(:subject_heading_type).should_not be_valid
+        expect(assigns(:subject_heading_type)).not_to be_valid
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -136,7 +136,7 @@ describe SubjectHeadingTypesController do
       it "assigns the requested subject_heading_type as @subject_heading_type" do
         subject_heading_type = FactoryGirl.create(:subject_heading_type)
         get :edit, :id => subject_heading_type.id
-        assigns(:subject_heading_type).should eq(subject_heading_type)
+        expect(assigns(:subject_heading_type)).to eq(subject_heading_type)
       end
     end
 
@@ -181,7 +181,7 @@ describe SubjectHeadingTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should be_valid
+          expect(assigns(:subject_heading_type)).to be_valid
         end
 
         it "redirects to the created agent" do
@@ -193,7 +193,7 @@ describe SubjectHeadingTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @invalid_attrs
-          assigns(:subject_heading_type).should_not be_valid
+          expect(assigns(:subject_heading_type)).not_to be_valid
         end
 
         it "should be successful" do
@@ -209,7 +209,7 @@ describe SubjectHeadingTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should be_valid
+          expect(assigns(:subject_heading_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -221,7 +221,7 @@ describe SubjectHeadingTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @invalid_attrs
-          assigns(:subject_heading_type).should_not be_valid
+          expect(assigns(:subject_heading_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -237,7 +237,7 @@ describe SubjectHeadingTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should be_valid
+          expect(assigns(:subject_heading_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -249,7 +249,7 @@ describe SubjectHeadingTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @invalid_attrs
-          assigns(:subject_heading_type).should_not be_valid
+          expect(assigns(:subject_heading_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -263,7 +263,7 @@ describe SubjectHeadingTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should be_valid
+          expect(assigns(:subject_heading_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -275,7 +275,7 @@ describe SubjectHeadingTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_heading_type as @subject_heading_type" do
           post :create, :subject_heading_type => @invalid_attrs
-          assigns(:subject_heading_type).should_not be_valid
+          expect(assigns(:subject_heading_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -303,7 +303,7 @@ describe SubjectHeadingTypesController do
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
           put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should eq(@subject_heading_type)
+          expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
         end
 
         it "moves its position when specified" do
@@ -330,7 +330,7 @@ describe SubjectHeadingTypesController do
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
           put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should eq(@subject_heading_type)
+          expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
           response.should be_forbidden
         end
       end
@@ -353,7 +353,7 @@ describe SubjectHeadingTypesController do
 
         it "assigns the requested subject_heading_type as @subject_heading_type" do
           put :update, :id => @subject_heading_type.id, :subject_heading_type => @attrs
-          assigns(:subject_heading_type).should eq(@subject_heading_type)
+          expect(assigns(:subject_heading_type)).to eq(@subject_heading_type)
           response.should be_forbidden
         end
       end

data/spec/controllers/subject_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        assigns(:subject_types).should eq(SubjectType.all)
+        expect(assigns(:subject_types)).to eq(SubjectType.all)
       end
     end
 
@@ -28,7 +28,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        assigns(:subject_types).should eq(SubjectType.all)
+        expect(assigns(:subject_types)).to eq(SubjectType.all)
       end
     end
 
@@ -37,7 +37,7 @@ describe SubjectTypesController do
 
       it "assigns all subject_types as @subject_types" do
         get :index
-        assigns(:subject_types).should be_empty
+        expect(assigns(:subject_types)).to be_empty
         response.should be_forbidden
       end
     end
@@ -45,7 +45,7 @@ describe SubjectTypesController do
     describe "When not logged in" do
       it "assigns all subject_types as @subject_types" do
         get :index
-        assigns(:subject_types).should be_empty
+        expect(assigns(:subject_types)).to be_empty
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -58,7 +58,7 @@ describe SubjectTypesController do
       it "assigns the requested subject_type as @subject_type" do
         subject_type = FactoryGirl.create(:subject_type)
         get :show, :id => subject_type.id
-        assigns(:subject_type).should eq(subject_type)
+        expect(assigns(:subject_type)).to eq(subject_type)
       end
     end
 
@@ -68,7 +68,7 @@ describe SubjectTypesController do
       it "assigns the requested subject_type as @subject_type" do
         subject_type = FactoryGirl.create(:subject_type)
         get :show, :id => subject_type.id
-        assigns(:subject_type).should eq(subject_type)
+        expect(assigns(:subject_type)).to eq(subject_type)
       end
     end
 
@@ -78,7 +78,7 @@ describe SubjectTypesController do
       it "assigns the requested subject_type as @subject_type" do
         subject_type = FactoryGirl.create(:subject_type)
         get :show, :id => subject_type.id
-        assigns(:subject_type).should eq(subject_type)
+        expect(assigns(:subject_type)).to eq(subject_type)
       end
     end
 
@@ -86,7 +86,7 @@ describe SubjectTypesController do
       it "assigns the requested subject_type as @subject_type" do
         subject_type = FactoryGirl.create(:subject_type)
         get :show, :id => subject_type.id
-        assigns(:subject_type).should eq(subject_type)
+        expect(assigns(:subject_type)).to eq(subject_type)
       end
     end
   end
@@ -97,7 +97,7 @@ describe SubjectTypesController do
 
       it "assigns the requested subject_type as @subject_type" do
         get :new
-        assigns(:subject_type).should_not be_valid
+        expect(assigns(:subject_type)).not_to be_valid
         response.should be_success
       end
     end
@@ -107,7 +107,7 @@ describe SubjectTypesController do
 
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        assigns(:subject_type).should_not be_valid
+        expect(assigns(:subject_type)).not_to be_valid
         response.should be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe SubjectTypesController do
 
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        assigns(:subject_type).should_not be_valid
+        expect(assigns(:subject_type)).not_to be_valid
         response.should be_forbidden
       end
     end
@@ -125,7 +125,7 @@ describe SubjectTypesController do
     describe "When not logged in" do
       it "should not assign the requested subject_type as @subject_type" do
         get :new
-        assigns(:subject_type).should_not be_valid
+        expect(assigns(:subject_type)).not_to be_valid
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -138,7 +138,7 @@ describe SubjectTypesController do
       it "assigns the requested subject_type as @subject_type" do
         subject_type = FactoryGirl.create(:subject_type)
         get :edit, :id => subject_type.id
-        assigns(:subject_type).should eq(subject_type)
+        expect(assigns(:subject_type)).to eq(subject_type)
       end
     end
 
@@ -183,7 +183,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          assigns(:subject_type).should be_valid
+          expect(assigns(:subject_type)).to be_valid
         end
 
         it "redirects to the created agent" do
@@ -195,7 +195,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          assigns(:subject_type).should_not be_valid
+          expect(assigns(:subject_type)).not_to be_valid
         end
 
         it "should be successful" do
@@ -211,7 +211,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          assigns(:subject_type).should be_valid
+          expect(assigns(:subject_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -223,7 +223,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          assigns(:subject_type).should_not be_valid
+          expect(assigns(:subject_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -239,7 +239,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          assigns(:subject_type).should be_valid
+          expect(assigns(:subject_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -251,7 +251,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          assigns(:subject_type).should_not be_valid
+          expect(assigns(:subject_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -265,7 +265,7 @@ describe SubjectTypesController do
       describe "with valid params" do
         it "assigns a newly created subject_type as @subject_type" do
           post :create, :subject_type => @attrs
-          assigns(:subject_type).should be_valid
+          expect(assigns(:subject_type)).to be_valid
         end
 
         it "should be forbidden" do
@@ -277,7 +277,7 @@ describe SubjectTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject_type as @subject_type" do
           post :create, :subject_type => @invalid_attrs
-          assigns(:subject_type).should_not be_valid
+          expect(assigns(:subject_type)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -305,7 +305,7 @@ describe SubjectTypesController do
 
         it "assigns the requested subject_type as @subject_type" do
           put :update, :id => @subject_type.id, :subject_type => @attrs
-          assigns(:subject_type).should eq(@subject_type)
+          expect(assigns(:subject_type)).to eq(@subject_type)
         end
 
         it "moves its position when specified" do
@@ -332,7 +332,7 @@ describe SubjectTypesController do
 
         it "assigns the requested subject_type as @subject_type" do
           put :update, :id => @subject_type.id, :subject_type => @attrs
-          assigns(:subject_type).should eq(@subject_type)
+          expect(assigns(:subject_type)).to eq(@subject_type)
           response.should be_forbidden
         end
       end
@@ -355,7 +355,7 @@ describe SubjectTypesController do
 
         it "assigns the requested subject_type as @subject_type" do
           put :update, :id => @subject_type.id, :subject_type => @attrs
-          assigns(:subject_type).should eq(@subject_type)
+          expect(assigns(:subject_type)).to eq(@subject_type)
           response.should be_forbidden
         end
       end

data/spec/controllers/subjects_controller_spec.rb

@@ -17,7 +17,7 @@ describe SubjectsController do
 
       it "assigns all subjects as @subjects" do
         get :index
-        assigns(:subjects).should_not be_nil
+        expect(assigns(:subjects)).not_to be_nil
       end
     end
 
@@ -26,7 +26,7 @@ describe SubjectsController do
 
       it "assigns all subjects as @subjects" do
         get :index
-        assigns(:subjects).should_not be_nil
+        expect(assigns(:subjects)).not_to be_nil
       end
     end
 
@@ -35,7 +35,7 @@ describe SubjectsController do
 
       it "assigns all subjects as @subjects" do
         get :index
-        assigns(:subjects).should_not be_nil
+        expect(assigns(:subjects)).not_to be_nil
       end
     end
 
@@ -43,7 +43,7 @@ describe SubjectsController do
       it "assigns all subjects as @subjects" do
         get :index
         response.should be_success
-        assigns(:subjects).should_not be_nil
+        expect(assigns(:subjects)).not_to be_nil
       end
     end
   end
@@ -55,7 +55,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :show, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
 
@@ -65,7 +65,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :show, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
 
@@ -75,7 +75,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :show, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
 
@@ -83,7 +83,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :show, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
   end
@@ -94,7 +94,7 @@ describe SubjectsController do
 
       it "assigns the requested subject as @subject" do
         get :new
-        assigns(:subject).should_not be_valid
+        expect(assigns(:subject)).not_to be_valid
       end
     end
 
@@ -103,7 +103,7 @@ describe SubjectsController do
 
       it "assigns the requested subject as @subject" do
         get :new
-        assigns(:subject).should_not be_valid
+        expect(assigns(:subject)).not_to be_valid
       end
     end
 
@@ -112,7 +112,7 @@ describe SubjectsController do
 
       it "should not assign the requested subject as @subject" do
         get :new
-        assigns(:subject).should_not be_valid
+        expect(assigns(:subject)).not_to be_valid
         response.should be_forbidden
       end
     end
@@ -120,7 +120,7 @@ describe SubjectsController do
     describe "When not logged in" do
       it "should not assign the requested subject as @subject" do
         get :new
-        assigns(:subject).should_not be_valid
+        expect(assigns(:subject)).not_to be_valid
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -133,7 +133,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :edit, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
 
@@ -143,7 +143,7 @@ describe SubjectsController do
       it "assigns the requested subject as @subject" do
         subject = FactoryGirl.create(:subject)
         get :edit, :id => subject.id
-        assigns(:subject).should eq(subject)
+        expect(assigns(:subject)).to eq(subject)
       end
     end
 
@@ -178,7 +178,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          assigns(:subject).should be_valid
+          expect(assigns(:subject)).to be_valid
         end
 
         it "redirects to the created subject" do
@@ -190,7 +190,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          assigns(:subject).should_not be_valid
+          expect(assigns(:subject)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
@@ -206,7 +206,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          assigns(:subject).should be_valid
+          expect(assigns(:subject)).to be_valid
         end
 
         it "should be forbidden" do
@@ -218,7 +218,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          assigns(:subject).should_not be_valid
+          expect(assigns(:subject)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -234,7 +234,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          assigns(:subject).should be_valid
+          expect(assigns(:subject)).to be_valid
         end
 
         it "should be forbidden" do
@@ -246,7 +246,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          assigns(:subject).should_not be_valid
+          expect(assigns(:subject)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -260,7 +260,7 @@ describe SubjectsController do
       describe "with valid params" do
         it "assigns a newly created subject as @subject" do
           post :create, :subject => @attrs
-          assigns(:subject).should be_valid
+          expect(assigns(:subject)).to be_valid
         end
 
         it "should be forbidden" do
@@ -272,7 +272,7 @@ describe SubjectsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved subject as @subject" do
           post :create, :subject => @invalid_attrs
-          assigns(:subject).should_not be_valid
+          expect(assigns(:subject)).not_to be_valid
         end
 
         it "should be forbidden" do
@@ -300,7 +300,7 @@ describe SubjectsController do
 
         it "assigns the requested subject as @subject" do
           put :update, :id => @subject.id, :subject => @attrs
-          assigns(:subject).should eq(@subject)
+          expect(assigns(:subject)).to eq(@subject)
         end
       end
 
@@ -322,7 +322,7 @@ describe SubjectsController do
 
         it "should be forbidden" do
           put :update, :id => @subject.id, :subject => @attrs
-          assigns(:subject).should eq(@subject)
+          expect(assigns(:subject)).to eq(@subject)
           response.should be_forbidden
         end
       end
@@ -345,7 +345,7 @@ describe SubjectsController do
 
         it "assigns the requested subject as @subject" do
           put :update, :id => @subject.id, :subject => @attrs
-          assigns(:subject).should eq(@subject)
+          expect(assigns(:subject)).to eq(@subject)
           response.should be_forbidden
         end
       end