enju_biblio 0.2.0 → 0.2.1

data/spec/controllers/agent_types_controller_spec.rb

@@ -29,113 +29,113 @@ describe AgentTypesController do
     FactoryGirl.attributes_for(:agent_type)
   end
 
-  describe "GET index" do
-    it "assigns all agent_types as @agent_types" do
+  describe 'GET index' do
+    it 'assigns all agent_types as @agent_types' do
       agent_type = AgentType.create! valid_attributes
       get :index
       expect(assigns(:agent_types)).to eq(AgentType.order(:position))
     end
   end
 
-  describe "GET show" do
-    it "assigns the requested agent_type as @agent_type" do
+  describe 'GET show' do
+    it 'assigns the requested agent_type as @agent_type' do
       agent_type = AgentType.create! valid_attributes
-      get :show, :id => agent_type.id
+      get :show, id: agent_type.id
       expect(assigns(:agent_type)).to eq(agent_type)
     end
   end
 
-  describe "GET new" do
-    it "assigns a new agent_type as @agent_type" do
+  describe 'GET new' do
+    it 'assigns a new agent_type as @agent_type' do
       get :new
       expect(assigns(:agent_type)).to be_a_new(AgentType)
     end
   end
 
-  describe "GET edit" do
-    it "assigns the requested agent_type as @agent_type" do
+  describe 'GET edit' do
+    it 'assigns the requested agent_type as @agent_type' do
       agent_type = AgentType.create! valid_attributes
-      get :edit, :id => agent_type.id
+      get :edit, id: agent_type.id
       expect(assigns(:agent_type)).to eq(agent_type)
     end
   end
 
-  describe "POST create" do
-    describe "with valid params" do
-      it "creates a new AgentType" do
-        expect {
-          post :create, :agent_type => valid_attributes
-        }.to change(AgentType, :count).by(1)
+  describe 'POST create' do
+    describe 'with valid params' do
+      it 'creates a new AgentType' do
+        expect do
+          post :create, agent_type: valid_attributes
+        end.to change(AgentType, :count).by(1)
       end
 
-      it "assigns a newly created agent_type as @agent_type" do
-        post :create, :agent_type => valid_attributes
+      it 'assigns a newly created agent_type as @agent_type' do
+        post :create, agent_type: valid_attributes
         expect(assigns(:agent_type)).to be_a(AgentType)
         expect(assigns(:agent_type)).to be_persisted
       end
 
-      it "redirects to the created agent_type" do
-        post :create, :agent_type => valid_attributes
+      it 'redirects to the created agent_type' do
+        post :create, agent_type: valid_attributes
         expect(response).to redirect_to(AgentType.last)
       end
     end
 
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved agent_type as @agent_type" do
+    describe 'with invalid params' do
+      it 'assigns a newly created but unsaved agent_type as @agent_type' do
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        post :create, :agent_type => {name: "test"}
+        post :create, agent_type: { name: 'test' }
         expect(assigns(:agent_type)).to be_a_new(AgentType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        post :create, :agent_type => {name: "test"}
-        expect(response).to render_template("new")
+        post :create, agent_type: { name: 'test' }
+        expect(response).to render_template('new')
       end
     end
   end
 
-  describe "PUT update" do
-    describe "with valid params" do
-      it "updates the requested agent_type" do
+  describe 'PUT update' do
+    describe 'with valid params' do
+      it 'updates the requested agent_type' do
         agent_type = AgentType.create! valid_attributes
         # Assuming there are no other agent_types in the database, this
         # specifies that the AgentType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        AgentType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
-        put :update, :id => agent_type.id, :agent_type => {'name' => 'test'}
+        AgentType.any_instance.should_receive(:update_attributes).with('name' => 'test')
+        put :update, id: agent_type.id, agent_type: { 'name' => 'test' }
       end
 
-      it "assigns the requested agent_type as @agent_type" do
+      it 'assigns the requested agent_type as @agent_type' do
         agent_type = AgentType.create! valid_attributes
-        put :update, :id => agent_type.id, :agent_type => valid_attributes
+        put :update, id: agent_type.id, agent_type: valid_attributes
         expect(assigns(:agent_type)).to eq(agent_type)
       end
 
-      it "redirects to the agent_type" do
+      it 'redirects to the agent_type' do
         agent_type = AgentType.create! valid_attributes
-        put :update, :id => agent_type.id, :agent_type => valid_attributes
+        put :update, id: agent_type.id, agent_type: valid_attributes
         expect(response).to redirect_to(agent_type)
       end
 
-      it "moves its position when specified" do
+      it 'moves its position when specified' do
         agent_type = AgentType.create! valid_attributes
         position = agent_type.position
-        put :update, :id => agent_type.id, :move => 'higher'
+        put :update, id: agent_type.id, move: 'higher'
         expect(response).to redirect_to agent_types_url
         assigns(:agent_type).reload.position.should eq position - 1
       end
     end
 
-    describe "with invalid params" do
-      it "assigns the agent_type as @agent_type" do
+    describe 'with invalid params' do
+      it 'assigns the agent_type as @agent_type' do
         agent_type = AgentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => agent_type.id, :agent_type => {name: "test"}
+        put :update, id: agent_type.id, agent_type: { name: 'test' }
         expect(assigns(:agent_type)).to eq(agent_type)
       end
 
@@ -143,30 +143,29 @@ describe AgentTypesController do
         agent_type = AgentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => agent_type.id, :agent_type => {name: "test"}
-        expect(response).to render_template("edit")
+        put :update, id: agent_type.id, agent_type: { name: 'test' }
+        expect(response).to render_template('edit')
       end
     end
   end
 
-  describe "DELETE destroy" do
-    it "destroys the requested agent_type" do
+  describe 'DELETE destroy' do
+    it 'destroys the requested agent_type' do
       agent_type = AgentType.create! valid_attributes
-      expect {
-        delete :destroy, :id => agent_type.id
-      }.to change(AgentType, :count).by(-1)
+      expect do
+        delete :destroy, id: agent_type.id
+      end.to change(AgentType, :count).by(-1)
     end
 
-    it "redirects to the agent_types list" do
+    it 'redirects to the agent_types list' do
       agent_type = AgentType.create! valid_attributes
-      delete :destroy, :id => agent_type.id
+      delete :destroy, id: agent_type.id
       expect(response).to redirect_to(agent_types_url)
     end
 
-    it "should not destroy agent_type that contains agents" do
+    it 'should not destroy agent_type that contains agents' do
       delete :destroy, id: agent_types(:agent_type_00001)
       expect(response).to be_forbidden
     end
   end
-
 end

data/spec/controllers/agents_controller_spec.rb

@@ -7,218 +7,218 @@ describe AgentsController do
     FactoryGirl.attributes_for(:agent)
   end
 
-  describe "GET index", :solr => true do
+  describe 'GET index', solr: true do
     before do
       Agent.reindex
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns all agents as @agents" do
+      it 'assigns all agents as @agents' do
         get :index
         expect(assigns(:agents)).not_to be_empty
       end
 
-      it "should get index with agent_id" do
-        get :index, :agent_id => 1
+      it 'should get index with agent_id' do
+        get :index, agent_id: 1
         expect(response).to be_success
         expect(assigns(:agent)).to eq Agent.find(1)
         expect(assigns(:agents)).to eq assigns(:agent).derived_agents.where('required_role_id >= 1').page(1)
       end
 
-      it "should get index with query" do
-        get :index, :query => 'Librarian1'
+      it 'should get index with query' do
+        get :index, query: 'Librarian1'
         expect(assigns(:agents)).not_to be_empty
         expect(response).to be_success
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns all agents as @agents" do
+      it 'assigns all agents as @agents' do
         get :index
         expect(assigns(:agents)).not_to be_empty
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns all agents as @agents" do
+      it 'assigns all agents as @agents' do
         get :index
         expect(assigns(:agents)).not_to be_empty
       end
     end
 
-    describe "When not logged in" do
-      it "assigns all agents as @agents" do
+    describe 'When not logged in' do
+      it 'assigns all agents as @agents' do
         get :index
         expect(assigns(:agents)).not_to be_empty
       end
 
-      it "assigns all agents as @agents in rss format" do
-        get :index, :format => :rss
+      it 'assigns all agents as @agents in rss format' do
+        get :index, format: :rss
         expect(assigns(:agents)).not_to be_empty
       end
 
-      it "assigns all agents as @agents in atom format" do
-        get :index, :format => :atom
+      it 'assigns all agents as @agents in atom format' do
+        get :index, format: :atom
         expect(assigns(:agents)).not_to be_empty
       end
 
-      it "should get index with agent_id" do
-        get :index, :agent_id => 1
+      it 'should get index with agent_id' do
+        get :index, agent_id: 1
         expect(response).to be_success
         expect(assigns(:agent)).to eq Agent.find(1)
-        expect(assigns(:agents)).to eq assigns(:agent).derived_agents.where(:required_role_id => 1).page(1)
+        expect(assigns(:agents)).to eq assigns(:agent).derived_agents.where(required_role_id: 1).page(1)
       end
 
-      it "should get index with manifestation_id" do
-        get :index, :manifestation_id => 1
+      it 'should get index with manifestation_id' do
+        get :index, manifestation_id: 1
         assigns(:manifestation).should eq Manifestation.find(1)
-        expect(assigns(:agents)).to eq assigns(:manifestation).publishers.where(:required_role_id => 1).page(1)
+        expect(assigns(:agents)).to eq assigns(:manifestation).publishers.where(required_role_id: 1).page(1)
       end
 
-      it "should get index with query" do
-        get :index, :query => 'Librarian1'
+      it 'should get index with query' do
+        get :index, query: 'Librarian1'
         expect(assigns(:agents)).to be_empty
         expect(response).to be_success
       end
     end
   end
 
-  describe "GET show" do
+  describe 'GET show' do
     before(:each) do
       @agent = FactoryGirl.create(:agent)
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent as @agent" do
-        get :show, :id => @agent.id
+      it 'assigns the requested agent as @agent' do
+        get :show, id: @agent.id
         expect(assigns(:agent)).to eq(@agent)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested agent as @agent" do
-        get :show, :id => @agent.id
+      it 'assigns the requested agent as @agent' do
+        get :show, id: @agent.id
         expect(assigns(:agent)).to eq(@agent)
       end
 
-      #it "should show agent when required_role is user" do
+      # it "should show agent when required_role is user" do
       #  get :show, :id => users(:user2).agent.id
       #  expect(assigns(:agent)).to eq(users(:user2).agent)
       #  expect(response).to be_success
-      #end
+      # end
 
-      #it "should show patron when required_role is librarian" do
+      # it "should show patron when required_role is librarian" do
       #  get :show, :id => users(:user1).agent.id
       #  expect(assigns(:agent)).to eq(users(:user1).agent)
       #  expect(response).to be_success
-      #end
+      # end
 
-      it "should not show agent who does not create a work" do
-        lambda{
-          get :show, :id => 3, :work_id => 3
-        }.should raise_error(ActiveRecord::RecordNotFound)
-        #expect(response).to be_missing
+      it 'should not show agent who does not create a work' do
+        lambda do
+          get :show, id: 3, work_id: 3
+        end.should raise_error(ActiveRecord::RecordNotFound)
+        # expect(response).to be_missing
       end
 
-      it "should not show agent who does not produce a manifestation" do
-        lambda{
-          get :show, :id => 4, :manifestation_id => 4
-        }.should raise_error(ActiveRecord::RecordNotFound)
-        #expect(response).to be_missing
+      it 'should not show agent who does not produce a manifestation' do
+        lambda do
+          get :show, id: 4, manifestation_id: 4
+        end.should raise_error(ActiveRecord::RecordNotFound)
+        # expect(response).to be_missing
       end
 
-      #it "should not show agent when required_role is 'Administrator'" do
+      # it "should not show agent when required_role is 'Administrator'" do
       #  sign_in users(:librarian2)
       #  get :show, :id => users(:librarian1).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested agent as @agent" do
-        get :show, :id => @agent.id
+      it 'assigns the requested agent as @agent' do
+        get :show, id: @agent.id
         expect(assigns(:agent)).to eq(@agent)
       end
 
-      #it "should show user" do
+      # it "should show user" do
       #  get :show, :id => users(:user2).agent.id
       #  assigns(:agent).required_role.name.should eq 'User'
       #  expect(response).to be_success
-      #end
+      # end
 
-      #it "should not show agent when required_role is 'Librarian'" do
+      # it "should not show agent when required_role is 'Librarian'" do
       #  sign_in users(:user2)
       #  get :show, :id => users(:user1).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When not logged in" do
-      it "assigns the requested agent as @agent" do
-        get :show, :id => @agent.id
+    describe 'When not logged in' do
+      it 'assigns the requested agent as @agent' do
+        get :show, id: @agent.id
         expect(assigns(:agent)).to eq(@agent)
       end
 
-      it "should show agent with work" do
-        get :show, :id => 1, :work_id => 1
+      it 'should show agent with work' do
+        get :show, id: 1, work_id: 1
         expect(assigns(:agent)).to eq assigns(:work).creators.first
       end
 
-      it "should show agent with manifestation" do
-        get :show, :id => 1, :manifestation_id => 1
+      it 'should show agent with manifestation' do
+        get :show, id: 1, manifestation_id: 1
         expect(assigns(:agent)).to eq assigns(:manifestation).publishers.first
       end
 
       it "should not show agent when required_role is 'User'" do
-        get :show, :id => 5
+        get :show, id: 5
         expect(response).to redirect_to new_user_session_url
       end
     end
   end
 
-  describe "GET new" do
-    describe "When logged in as Administrator" do
+  describe 'GET new' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent as @agent" do
+      it 'assigns the requested agent as @agent' do
         get :new
         expect(assigns(:agent)).not_to be_valid
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested agent as @agent" do
+      it 'assigns the requested agent as @agent' do
         get :new
         expect(assigns(:agent)).not_to be_valid
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should not assign the requested agent as @agent" do
+      it 'should not assign the requested agent as @agent' do
         get :new
         expect(assigns(:agent)).to be_nil
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested agent as @agent" do
+    describe 'When not logged in' do
+      it 'should not assign the requested agent as @agent' do
         get :new
         expect(assigns(:agent)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -226,417 +226,417 @@ describe AgentsController do
     end
   end
 
-  describe "GET edit" do
-    describe "When logged in as Administrator" do
+  describe 'GET edit' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent as @agent" do
+      it 'assigns the requested agent as @agent' do
         agent = Agent.find(1)
-        get :edit, :id => agent.id
+        get :edit, id: agent.id
         expect(assigns(:agent)).to eq(agent)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested agent as @agent" do
+      it 'assigns the requested agent as @agent' do
         agent = Agent.find(1)
-        get :edit, :id => agent.id
+        get :edit, id: agent.id
         expect(assigns(:agent)).to eq(agent)
       end
 
-      #it "should edit agent when its required_role is 'User'" do
+      # it "should edit agent when its required_role is 'User'" do
       #  get :edit, :id => users(:user2).agent.id
       #  expect(response).to be_success
-      #end
+      # end
 
-      #it "should edit agent when its required_role is 'Librarian'" do
+      # it "should edit agent when its required_role is 'Librarian'" do
       #  get :edit, :id => users(:user1).agent.id
       #  expect(response).to be_success
-      #end
-  
-      #it "should edit admin" do
+      # end
+
+      # it "should edit admin" do
       #  get :edit, :id => users(:admin).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested agent as @agent" do
+      it 'assigns the requested agent as @agent' do
         agent = Agent.find(1)
-        get :edit, :id => agent.id
+        get :edit, id: agent.id
         expect(response).to be_forbidden
       end
 
-      #it "should edit myself" do
+      # it "should edit myself" do
       #  get :edit, :id => users(:user1).agent.id
       #  expect(response).to be_success
-      #end
+      # end
 
-      #it "should not edit other user's agent profile" do
+      # it "should not edit other user's agent profile" do
       #  get :edit, :id => users(:user2).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested agent as @agent" do
+    describe 'When not logged in' do
+      it 'should not assign the requested agent as @agent' do
         agent = Agent.find(1)
-        get :edit, :id => agent.id
+        get :edit, id: agent.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
-  describe "POST create" do
+  describe 'POST create' do
     before(:each) do
       @attrs = valid_attributes
-      @invalid_attrs = FactoryGirl.attributes_for(:agent, :full_name => '')
+      @invalid_attrs = FactoryGirl.attributes_for(:agent, full_name: '')
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      describe "with valid params" do
-        it "assigns a newly created agent as @agent" do
-          post :create, :agent => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created agent as @agent' do
+          post :create, agent: @attrs
           expect(assigns(:agent)).to be_valid
         end
 
-        it "redirects to the created agent" do
-          post :create, :agent => @attrs
+        it 'redirects to the created agent' do
+          post :create, agent: @attrs
           expect(response).to redirect_to(agent_url(assigns(:agent)))
         end
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved agent as @agent" do
-          post :create, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved agent as @agent' do
+          post :create, agent: @invalid_attrs
           expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :agent => @invalid_attrs
-          expect(response).to render_template("new")
+          post :create, agent: @invalid_attrs
+          expect(response).to render_template('new')
         end
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      describe "with valid params" do
-        it "assigns a newly created agent as @agent" do
-          post :create, :agent => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created agent as @agent' do
+          post :create, agent: @attrs
           expect(assigns(:agent)).to be_valid
         end
 
-        it "redirects to the created agent" do
-          post :create, :agent => @attrs
+        it 'redirects to the created agent' do
+          post :create, agent: @attrs
           expect(response).to redirect_to(agent_url(assigns(:agent)))
         end
 
-        it "should create a relationship if work_id is set" do
-          post :create, :agent => @attrs, :work_id => 1
+        it 'should create a relationship if work_id is set' do
+          post :create, agent: @attrs, work_id: 1
           expect(response).to redirect_to(agent_url(assigns(:agent)))
           assigns(:agent).works.should eq [Manifestation.find(1)]
         end
 
-        it "should create a relationship if manifestation_id is set" do
-          post :create, :agent => @attrs, :manifestation_id => 1
+        it 'should create a relationship if manifestation_id is set' do
+          post :create, agent: @attrs, manifestation_id: 1
           expect(response).to redirect_to(agent_url(assigns(:agent)))
           assigns(:agent).manifestations.should eq [Manifestation.find(1)]
         end
 
-        it "should create a relationship if item_id is set" do
-          post :create, :agent => @attrs, :item_id => 1
+        it 'should create a relationship if item_id is set' do
+          post :create, agent: @attrs, item_id: 1
           expect(response).to redirect_to(agent_url(assigns(:agent)))
           assigns(:agent).items.should eq [Item.find(1)]
         end
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved agent as @agent" do
-          post :create, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved agent as @agent' do
+          post :create, agent: @invalid_attrs
           expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :agent => @invalid_attrs
-          expect(response).to render_template("new")
+          post :create, agent: @invalid_attrs
+          expect(response).to render_template('new')
         end
       end
 
       # TODO: full_name以外での判断
-      it "should create agent without full_name" do
-        post :create, :agent => { :first_name => 'test' }
+      it 'should create agent without full_name' do
+        post :create, agent: { first_name: 'test' }
         expect(response).to redirect_to agent_url(assigns(:agent))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      describe "with valid params" do
-        it "assigns a newly created agent as @agent" do
-          post :create, :agent => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created agent as @agent' do
+          post :create, agent: @attrs
           expect(assigns(:agent)).to be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :agent => @attrs
+        it 'should be forbidden' do
+          post :create, agent: @attrs
           expect(response).to be_forbidden
         end
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved agent as @agent" do
-          post :create, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved agent as @agent' do
+          post :create, agent: @invalid_attrs
           expect(assigns(:agent)).to be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :agent => @invalid_attrs
+        it 'should be forbidden' do
+          post :create, agent: @invalid_attrs
           expect(response).to be_forbidden
         end
       end
 
-      #it "should not create agent myself" do
+      # it "should not create agent myself" do
       #  post :create, :agent => { :full_name => 'test', :user_username => users(:user1).username }
       #  expect(assigns(:agent)).not_to be_valid
       #  expect(response).to be_success
-      #end
+      # end
 
-      #it "should not create other agent" do
+      # it "should not create other agent" do
       #  post :create, :agent => { :full_name => 'test', :user_id => users(:user2).username }
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "assigns a newly created agent as @agent" do
-          post :create, :agent => @attrs
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'assigns a newly created agent as @agent' do
+          post :create, agent: @attrs
           expect(assigns(:agent)).to be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :agent => @attrs
+        it 'should be forbidden' do
+          post :create, agent: @attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved agent as @agent" do
-          post :create, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved agent as @agent' do
+          post :create, agent: @invalid_attrs
           expect(assigns(:agent)).to be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :agent => @invalid_attrs
+        it 'should be forbidden' do
+          post :create, agent: @invalid_attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
   end
 
-  describe "PUT update" do
+  describe 'PUT update' do
     before(:each) do
       @agent = FactoryGirl.create(:agent)
       @attrs = valid_attributes
-      @invalid_attrs = FactoryGirl.attributes_for(:agent, :full_name => '')
+      @invalid_attrs = FactoryGirl.attributes_for(:agent, full_name: '')
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      describe "with valid params" do
-        it "updates the requested agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+      describe 'with valid params' do
+        it 'updates the requested agent' do
+          put :update, id: @agent.id, agent: @attrs
         end
 
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @attrs
           expect(assigns(:agent)).to eq(@agent)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @invalid_attrs
-          expect(response).to render_template("edit")
+      describe 'with invalid params' do
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @invalid_attrs
+          expect(response).to render_template('edit')
         end
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      describe "with valid params" do
-        it "updates the requested agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+      describe 'with valid params' do
+        it 'updates the requested agent' do
+          put :update, id: @agent.id, agent: @attrs
         end
 
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @attrs
           expect(assigns(:agent)).to eq(@agent)
           expect(response).to redirect_to(@agent)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the agent as @agent" do
-          put :update, :id => @agent, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns the agent as @agent' do
+          put :update, id: @agent, agent: @invalid_attrs
           expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @agent, :agent => @invalid_attrs
-          expect(response).to render_template("edit")
+          put :update, id: @agent, agent: @invalid_attrs
+          expect(response).to render_template('edit')
         end
       end
 
-      #it "should update other agent" do
+      # it "should update other agent" do
       #  put :update, :id => users(:user2).agent.id, :agent => { :full_name => 'test' }
       #  expect(response).to redirect_to agent_url(assigns(:agent))
-      #end
+      # end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      describe "with valid params" do
-        it "updates the requested agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+      describe 'with valid params' do
+        it 'updates the requested agent' do
+          put :update, id: @agent.id, agent: @attrs
         end
 
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @attrs
           expect(assigns(:agent)).to eq(@agent)
           expect(response).to be_forbidden
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @invalid_attrs
           expect(response).to be_forbidden
         end
       end
 
-      #it "should update myself" do
+      # it "should update myself" do
       #  put :update, :id => users(:user1).agent.id, :agent => { :full_name => 'test' }
       #  expect(assigns(:agent)).to be_valid
       #  expect(response).to redirect_to agent_url(assigns(:agent))
-      #end
-  
-      #it "should not update myself without name" do
+      # end
+
+      # it "should not update myself without name" do
       #  put :update, :id => users(:user1).agent.id, :agent => { :first_name => '', :last_name => '', :full_name => '' }
       #  expect(assigns(:agent)).not_to be_valid
       #  expect(response).to be_success
-      #end
-  
-      #it "should not update other agent" do
+      # end
+
+      # it "should not update other agent" do
       #  put :update, :id => users(:user2).agent.id, :agent => { :full_name => 'test' }
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "updates the requested agent" do
-          put :update, :id => @agent.id, :agent => @attrs
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'updates the requested agent' do
+          put :update, id: @agent.id, agent: @attrs
         end
 
-        it "should be forbidden" do
-          put :update, :id => @agent.id, :agent => @attrs
+        it 'should be forbidden' do
+          put :update, id: @agent.id, agent: @attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested agent as @agent" do
-          put :update, :id => @agent.id, :agent => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns the requested agent as @agent' do
+          put :update, id: @agent.id, agent: @invalid_attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe 'DELETE destroy' do
     before(:each) do
       @agent = FactoryGirl.create(:agent)
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "destroys the requested agent" do
-        delete :destroy, :id => @agent.id
+      it 'destroys the requested agent' do
+        delete :destroy, id: @agent.id
       end
 
-      it "redirects to the agents list" do
-        delete :destroy, :id => @agent.id
+      it 'redirects to the agents list' do
+        delete :destroy, id: @agent.id
         expect(response).to redirect_to(agents_url)
       end
 
-      #it "should not destroy librarian who has items checked out" do
+      # it "should not destroy librarian who has items checked out" do
       #  delete :destroy, :id => users(:librarian1).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
 
-      #it "should destroy librarian who does not have items checked out" do
+      # it "should destroy librarian who does not have items checked out" do
       #  delete :destroy, :id => users(:librarian2).agent.id
       #  expect(response).to redirect_to agents_url
-      #end
+      # end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "destroys the requested agent" do
-        delete :destroy, :id => @agent.id
+      it 'destroys the requested agent' do
+        delete :destroy, id: @agent.id
       end
 
-      it "redirects to the agents list" do
-        delete :destroy, :id => @agent.id
+      it 'redirects to the agents list' do
+        delete :destroy, id: @agent.id
         expect(response).to redirect_to(agents_url)
       end
 
-      #it "should not destroy librarian" do
+      # it "should not destroy librarian" do
       #  delete :destroy, :id => users(:librarian2).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "destroys the requested agent" do
-        delete :destroy, :id => @agent.id
+      it 'destroys the requested agent' do
+        delete :destroy, id: @agent.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @agent.id
+      it 'should be forbidden' do
+        delete :destroy, id: @agent.id
         expect(response).to be_forbidden
       end
 
-      #it "should not destroy agent" do
+      # it "should not destroy agent" do
       #  delete :destroy, :id => users(:user1).agent.id
       #  expect(response).to be_forbidden
-      #end
+      # end
     end
 
-    describe "When not logged in" do
-      it "destroys the requested agent" do
-        delete :destroy, :id => @agent.id
+    describe 'When not logged in' do
+      it 'destroys the requested agent' do
+        delete :destroy, id: @agent.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @agent.id
+      it 'should be forbidden' do
+        delete :destroy, id: @agent.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end