enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/controllers/agents_controller_spec.rb

@@ -17,20 +17,20 @@ describe AgentsController do
 
       it "assigns all agents as @agents" do
         get :index
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
 
       it "should get index with agent_id" do
         get :index, :agent_id => 1
-        response.should be_success
-        assigns(:agent).should eq Agent.find(1)
-        assigns(:agents).should eq assigns(:agent).derived_agents.where('required_role_id >= 1').page(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'
-        assigns(:agents).should_not be_empty
-        response.should be_success
+        expect(assigns(:agents)).not_to be_empty
+        expect(response).to be_success
       end
     end
 
@@ -39,7 +39,7 @@ describe AgentsController do
 
       it "assigns all agents as @agents" do
         get :index
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
     end
 
@@ -48,43 +48,43 @@ describe AgentsController do
 
       it "assigns all agents as @agents" do
         get :index
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
     end
 
     describe "When not logged in" do
       it "assigns all agents as @agents" do
         get :index
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
 
       it "assigns all agents as @agents in rss format" do
         get :index, :format => :rss
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
 
       it "assigns all agents as @agents in atom format" do
         get :index, :format => :atom
-        assigns(:agents).should_not be_empty
+        expect(assigns(:agents)).not_to be_empty
       end
 
       it "should get index with agent_id" do
         get :index, :agent_id => 1
-        response.should be_success
-        assigns(:agent).should eq Agent.find(1)
-        assigns(:agents).should eq assigns(:agent).derived_agents.where(:required_role_id => 1).page(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 manifestation_id" do
         get :index, :manifestation_id => 1
         assigns(:manifestation).should eq Manifestation.find(1)
-        assigns(:agents).should 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'
-        assigns(:agents).should be_empty
-        response.should be_success
+        expect(assigns(:agents)).to be_empty
+        expect(response).to be_success
       end
     end
   end
@@ -99,7 +99,7 @@ describe AgentsController do
 
       it "assigns the requested agent as @agent" do
         get :show, :id => @agent.id
-        assigns(:agent).should eq(@agent)
+        expect(assigns(:agent)).to eq(@agent)
       end
     end
 
@@ -108,39 +108,39 @@ describe AgentsController do
 
       it "assigns the requested agent as @agent" do
         get :show, :id => @agent.id
-        assigns(:agent).should eq(@agent)
+        expect(assigns(:agent)).to eq(@agent)
       end
 
       #it "should show agent when required_role is user" do
       #  get :show, :id => users(:user2).agent.id
-      #  assigns(:agent).should eq(users(:user2).agent)
-      #  response.should be_success
+      #  expect(assigns(:agent)).to eq(users(:user2).agent)
+      #  expect(response).to be_success
       #end
 
       #it "should show_ atron when required_role is librarian" do
       #  get :show, :id => users(:user1).agent.id
-      #  assigns(:agent).should eq(users(:user1).agent)
-      #  response.should be_success
+      #  expect(assigns(:agent)).to eq(users(:user1).agent)
+      #  expect(response).to be_success
       #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)
-        #response.should be_missing
+        #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)
-        #response.should be_missing
+        #expect(response).to be_missing
       end
 
       #it "should not show agent when required_role is 'Administrator'" do
       #  sign_in users(:librarian2)
       #  get :show, :id => users(:librarian1).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -149,41 +149,41 @@ describe AgentsController do
 
       it "assigns the requested agent as @agent" do
         get :show, :id => @agent.id
-        assigns(:agent).should eq(@agent)
+        expect(assigns(:agent)).to eq(@agent)
       end
 
       #it "should show user" do
       #  get :show, :id => users(:user2).agent.id
       #  assigns(:agent).required_role.name.should eq 'User'
-      #  response.should be_success
+      #  expect(response).to be_success
       #end
 
       #it "should not show agent when required_role is 'Librarian'" do
       #  sign_in users(:user2)
       #  get :show, :id => users(:user1).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
     describe "When not logged in" do
       it "assigns the requested agent as @agent" do
         get :show, :id => @agent.id
-        assigns(:agent).should eq(@agent)
+        expect(assigns(:agent)).to eq(@agent)
       end
 
       it "should show agent with work" do
         get :show, :id => 1, :work_id => 1
-        assigns(:agent).should eq assigns(:work).creators.first
+        expect(assigns(:agent)).to eq assigns(:work).creators.first
       end
 
       it "should show agent with manifestation" do
         get :show, :id => 1, :manifestation_id => 1
-        assigns(:agent).should eq assigns(:manifestation).publishers.first
+        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
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -194,7 +194,7 @@ describe AgentsController do
 
       it "assigns the requested agent as @agent" do
         get :new
-        assigns(:agent).should_not be_valid
+        expect(assigns(:agent)).not_to be_valid
       end
     end
 
@@ -203,7 +203,7 @@ describe AgentsController do
 
       it "assigns the requested agent as @agent" do
         get :new
-        assigns(:agent).should_not be_valid
+        expect(assigns(:agent)).not_to be_valid
       end
     end
 
@@ -212,16 +212,16 @@ describe AgentsController do
 
       it "should not assign the requested agent as @agent" do
         get :new
-        assigns(:agent).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:agent)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested agent as @agent" do
         get :new
-        assigns(:agent).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:agent)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -233,7 +233,7 @@ describe AgentsController do
       it "assigns the requested agent as @agent" do
         agent = Agent.find(1)
         get :edit, :id => agent.id
-        assigns(:agent).should eq(agent)
+        expect(assigns(:agent)).to eq(agent)
       end
     end
 
@@ -243,22 +243,22 @@ describe AgentsController do
       it "assigns the requested agent as @agent" do
         agent = Agent.find(1)
         get :edit, :id => agent.id
-        assigns(:agent).should eq(agent)
+        expect(assigns(:agent)).to eq(agent)
       end
 
       #it "should edit agent when its required_role is 'User'" do
       #  get :edit, :id => users(:user2).agent.id
-      #  response.should be_success
+      #  expect(response).to be_success
       #end
 
       #it "should edit agent when its required_role is 'Librarian'" do
       #  get :edit, :id => users(:user1).agent.id
-      #  response.should be_success
+      #  expect(response).to be_success
       #end
   
       #it "should edit admin" do
       #  get :edit, :id => users(:admin).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -268,17 +268,17 @@ describe AgentsController do
       it "assigns the requested agent as @agent" do
         agent = Agent.find(1)
         get :edit, :id => agent.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
 
       #it "should edit myself" do
       #  get :edit, :id => users(:user1).agent.id
-      #  response.should be_success
+      #  expect(response).to be_success
       #end
 
       #it "should not edit other user's agent profile" do
       #  get :edit, :id => users(:user2).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -286,7 +286,7 @@ describe AgentsController do
       it "should not assign the requested agent as @agent" do
         agent = Agent.find(1)
         get :edit, :id => agent.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -303,24 +303,24 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          assigns(:agent).should be_valid
+          expect(assigns(:agent)).to be_valid
         end
 
         it "redirects to the created agent" do
           post :create, :agent => @attrs
-          response.should redirect_to(agent_url(assigns(:agent)))
+          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
-          assigns(:agent).should_not be_valid
+          expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :agent => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -331,29 +331,29 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          assigns(:agent).should be_valid
+          expect(assigns(:agent)).to be_valid
         end
 
         it "redirects to the created agent" do
           post :create, :agent => @attrs
-          response.should redirect_to(agent_url(assigns(:agent)))
+          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
-          response.should redirect_to(agent_url(assigns(:agent)))
+          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
-          response.should redirect_to(agent_url(assigns(:agent)))
+          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
-          response.should redirect_to(agent_url(assigns(:agent)))
+          expect(response).to redirect_to(agent_url(assigns(:agent)))
           assigns(:agent).items.should eq [Item.find(1)]
         end
       end
@@ -361,19 +361,19 @@ describe AgentsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent as @agent" do
           post :create, :agent => @invalid_attrs
-          assigns(:agent).should_not be_valid
+          expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :agent => @invalid_attrs
-          response.should render_template("new")
+          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' }
-        response.should redirect_to agent_url(assigns(:agent))
+        expect(response).to redirect_to agent_url(assigns(:agent))
       end
     end
 
@@ -383,36 +383,36 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          assigns(:agent).should be_valid
+          expect(assigns(:agent)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :agent => @attrs
-          response.should be_forbidden
+          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
-          assigns(:agent).should_not be_valid
+          expect(assigns(:agent)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :agent => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       #it "should not create agent myself" do
       #  post :create, :agent => { :full_name => 'test', :user_username => users(:user1).username }
-      #  assigns(:agent).should_not be_valid
-      #  response.should be_success
+      #  expect(assigns(:agent)).not_to be_valid
+      #  expect(response).to be_success
       #end
 
       #it "should not create other agent" do
       #  post :create, :agent => { :full_name => 'test', :user_id => users(:user2).username }
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -420,24 +420,24 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          assigns(:agent).should be_valid
+          expect(assigns(:agent)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :agent => @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 agent as @agent" do
           post :create, :agent => @invalid_attrs
-          assigns(:agent).should_not be_valid
+          expect(assigns(:agent)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :agent => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -460,14 +460,14 @@ describe AgentsController do
 
         it "assigns the requested agent as @agent" do
           put :update, :id => @agent.id, :agent => @attrs
-          assigns(:agent).should eq(@agent)
+          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
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -482,26 +482,26 @@ describe AgentsController do
 
         it "assigns the requested agent as @agent" do
           put :update, :id => @agent.id, :agent => @attrs
-          assigns(:agent).should eq(@agent)
-          response.should redirect_to(@agent)
+          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
-          assigns(:agent).should_not be_valid
+          expect(assigns(:agent)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @agent, :agent => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
 
       #it "should update other agent" do
       #  put :update, :id => users(:user2).agent.id, :agent => { :full_name => 'test' }
-      #  response.should redirect_to agent_url(assigns(:agent))
+      #  expect(response).to redirect_to agent_url(assigns(:agent))
       #end
     end
 
@@ -515,33 +515,33 @@ describe AgentsController do
 
         it "assigns the requested agent as @agent" do
           put :update, :id => @agent.id, :agent => @attrs
-          assigns(:agent).should eq(@agent)
-          response.should be_forbidden
+          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
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       #it "should update myself" do
       #  put :update, :id => users(:user1).agent.id, :agent => { :full_name => 'test' }
-      #  assigns(:agent).should be_valid
-      #  response.should redirect_to agent_url(assigns(:agent))
+      #  expect(assigns(:agent)).to be_valid
+      #  expect(response).to redirect_to agent_url(assigns(:agent))
       #end
   
       #it "should not update myself without name" do
       #  put :update, :id => users(:user1).agent.id, :agent => { :first_name => '', :last_name => '', :full_name => '' }
-      #  assigns(:agent).should_not be_valid
-      #  response.should be_success
+      #  expect(assigns(:agent)).not_to be_valid
+      #  expect(response).to be_success
       #end
   
       #it "should not update other agent" do
       #  put :update, :id => users(:user2).agent.id, :agent => { :full_name => 'test' }
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -553,14 +553,14 @@ describe AgentsController do
 
         it "should be forbidden" do
           put :update, :id => @agent.id, :agent => @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 agent as @agent" do
           put :update, :id => @agent.id, :agent => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -580,17 +580,17 @@ describe AgentsController do
 
       it "redirects to the agents list" do
         delete :destroy, :id => @agent.id
-        response.should redirect_to(agents_url)
+        expect(response).to redirect_to(agents_url)
       end
 
       #it "should not destroy librarian who has items checked out" do
       #  delete :destroy, :id => users(:librarian1).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
 
       #it "should destroy librarian who does not have items checked out" do
       #  delete :destroy, :id => users(:librarian2).agent.id
-      #  response.should redirect_to agents_url
+      #  expect(response).to redirect_to agents_url
       #end
     end
 
@@ -603,12 +603,12 @@ describe AgentsController do
 
       it "redirects to the agents list" do
         delete :destroy, :id => @agent.id
-        response.should redirect_to(agents_url)
+        expect(response).to redirect_to(agents_url)
       end
 
       #it "should not destroy librarian" do
       #  delete :destroy, :id => users(:librarian2).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -621,12 +621,12 @@ describe AgentsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @agent.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
 
       #it "should not destroy agent" do
       #  delete :destroy, :id => users(:user1).agent.id
-      #  response.should be_forbidden
+      #  expect(response).to be_forbidden
       #end
     end
 
@@ -637,7 +637,7 @@ describe AgentsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @agent.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end