enju_biblio 0.1.0.pre49 → 0.1.0.pre50

data/spec/controllers/countries_controller_spec.rb

@@ -97,7 +97,7 @@ describe CountriesController do
       it "assigns the requested country as @country" do
         get :new
         assigns(:country).should_not be_valid
-        response.should be_forbidden
+        response.should be_success
       end
     end
 
@@ -185,9 +185,9 @@ describe CountriesController do
           assigns(:country).should be_valid
         end
 
-        it "should be forbidden" do
+        it "redirects to the created country" do
           post :create, :country => @attrs
-          response.should be_forbidden
+          response.should redirect_to(assigns(:country))
         end
       end
 
@@ -197,9 +197,9 @@ describe CountriesController do
           assigns(:country).should_not be_valid
         end
 
-        it "should be forbidden" do
+        it "re-renders the 'new' template" do
           post :create, :country => @invalid_attrs
-          response.should be_forbidden
+          response.should render_template("new")
         end
       end
     end
@@ -408,9 +408,9 @@ describe CountriesController do
         delete :destroy, :id => @country.id
       end
 
-      it "should be forbidden" do
+      it "redirects to the countries list" do
         delete :destroy, :id => @country.id
-        response.should be_forbidden
+        response.should redirect_to(countries_url)
       end
     end
 

data/spec/controllers/extents_controller_spec.rb

@@ -1,445 +1,166 @@
 require 'spec_helper'
-require 'sunspot/rails/spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
 
 describe ExtentsController do
-  fixtures :all
-  disconnect_sunspot
+  login_admin
 
+  # This should return the minimal set of attributes required to create a valid
+  # Extent. As you add validations to Extent, be sure to
+  # update the return value of this method accordingly.
   def valid_attributes
     FactoryGirl.attributes_for(:extent)
   end
 
   describe "GET index" do
-    before(:each) do
-      FactoryGirl.create(:extent)
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns all extents as @extents" do
-        get :index
-        assigns(:extents).should eq(Extent.all)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns all extents as @extents" do
-        get :index
-        assigns(:extents).should eq(Extent.all)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns all extents as @extents" do
-        get :index
-        assigns(:extents).should eq(Extent.all)
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns all extents as @extents" do
-        get :index
-        assigns(:extents).should eq(Extent.all)
-      end
+    it "assigns all extents as @extents" do
+      extent = Extent.create! valid_attributes
+      get :index
+      assigns(:extents).should eq(Extent.all)
     end
   end
 
   describe "GET show" do
-    before(:each) do
-      @extent = FactoryGirl.create(:extent)
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested extent as @extent" do
-        get :show, :id => @extent.id
-        assigns(:extent).should eq(@extent)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested extent as @extent" do
-        get :show, :id => @extent.id
-        assigns(:extent).should eq(@extent)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns the requested extent as @extent" do
-        get :show, :id => @extent.id
-        assigns(:extent).should eq(@extent)
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns the requested extent as @extent" do
-        get :show, :id => @extent.id
-        assigns(:extent).should eq(@extent)
-      end
+    it "assigns the requested extent as @extent" do
+      extent = Extent.create! valid_attributes
+      get :show, :id => extent.id
+      assigns(:extent).should eq(extent)
     end
   end
 
   describe "GET new" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested extent as @extent" do
-        get :new
-        assigns(:extent).should_not be_valid
-        response.should be_forbidden
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "should not assign the requested extent as @extent" do
-        get :new
-        assigns(:extent).should_not be_valid
-        response.should be_forbidden
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "should not assign the requested extent as @extent" do
-        get :new
-        assigns(:extent).should_not be_valid
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "should not assign the requested extent as @extent" do
-        get :new
-        assigns(:extent).should_not be_valid
-        response.should redirect_to(new_user_session_url)
-      end
+    it "assigns a new extent as @extent" do
+      get :new
+      assigns(:extent).should be_a_new(Extent)
     end
   end
 
   describe "GET edit" do
-    before(:each) do
-      @extent = FactoryGirl.create(:extent)
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested extent as @extent" do
-        get :edit, :id => @extent.id
-        assigns(:extent).should eq(@extent)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested extent as @extent" do
-        get :edit, :id => @extent.id
-        response.should be_forbidden
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns the requested extent as @extent" do
-        get :edit, :id => @extent.id
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "should not assign the requested extent as @extent" do
-        get :edit, :id => @extent.id
-        response.should redirect_to(new_user_session_url)
-      end
+    it "assigns the requested extent as @extent" do
+      extent = Extent.create! valid_attributes
+      get :edit, :id => extent.id
+      assigns(:extent).should eq(extent)
     end
   end
 
   describe "POST create" do
-    before(:each) do
-      @attrs = valid_attributes
-      @invalid_attrs = {:name => ''}
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      describe "with valid params" do
-        it "assigns a newly created extent as @extent" do
-          post :create, :extent => @attrs
-          assigns(:extent).should be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @attrs
-          response.should be_forbidden
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved extent as @extent" do
-          post :create, :extent => @invalid_attrs
-          assigns(:extent).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @invalid_attrs
-          response.should be_forbidden
-        end
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "assigns a newly created extent as @extent" do
-          post :create, :extent => @attrs
-          assigns(:extent).should be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @attrs
-          response.should be_forbidden
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved extent as @extent" do
-          post :create, :extent => @invalid_attrs
-          assigns(:extent).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @invalid_attrs
-          response.should be_forbidden
-        end
+    describe "with valid params" do
+      it "creates a new Extent" do
+        expect {
+          post :create, :extent => valid_attributes
+        }.to change(Extent, :count).by(1)
       end
-    end
-
-    describe "When logged in as User" do
-      login_user
 
-      describe "with valid params" do
-        it "assigns a newly created extent as @extent" do
-          post :create, :extent => @attrs
-          assigns(:extent).should be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @attrs
-          response.should be_forbidden
-        end
+      it "assigns a newly created extent as @extent" do
+        post :create, :extent => valid_attributes
+        assigns(:extent).should be_a(Extent)
+        assigns(:extent).should be_persisted
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved extent as @extent" do
-          post :create, :extent => @invalid_attrs
-          assigns(:extent).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @invalid_attrs
-          response.should be_forbidden
-        end
+      it "redirects to the created extent" do
+        post :create, :extent => valid_attributes
+        response.should redirect_to(Extent.last)
       end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "assigns a newly created extent as @extent" do
-          post :create, :extent => @attrs
-          assigns(:extent).should be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @attrs
-          response.should redirect_to(new_user_session_url)
-        end
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved extent as @extent" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Extent.any_instance.stub(:save).and_return(false)
+        post :create, :extent => {}
+        assigns(:extent).should be_a_new(Extent)
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved extent as @extent" do
-          post :create, :extent => @invalid_attrs
-          assigns(:extent).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :extent => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
-        end
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Extent.any_instance.stub(:save).and_return(false)
+        post :create, :extent => {}
+        #response.should render_template("new")
       end
     end
   end
 
   describe "PUT update" do
-    before(:each) do
-      @extent = FactoryGirl.create(:extent)
-      @attrs = valid_attributes
-      @invalid_attrs = {:name => ''}
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      describe "with valid params" do
-        it "updates the requested extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-        end
-
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-          assigns(:extent).should eq(@extent)
-        end
-
-        it "moves its position when specified" do
-          put :update, :id => @extent.id, :extent => @attrs, :move => 'lower'
-          response.should redirect_to(extents_url)
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @invalid_attrs
-          response.should render_template("edit")
-        end
+    describe "with valid params" do
+      it "updates the requested extent" do
+        extent = Extent.create! valid_attributes
+        # Assuming there are no other extents in the database, this
+        # specifies that the Extent created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        Extent.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
+        put :update, :id => extent.id, :extent => {'these' => 'params'}
       end
-    end
 
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "updates the requested extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-        end
-
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-          assigns(:extent).should eq(@extent)
-          response.should be_forbidden
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @invalid_attrs
-          response.should be_forbidden
-        end
+      it "assigns the requested extent as @extent" do
+        extent = Extent.create! valid_attributes
+        put :update, :id => extent.id, :extent => valid_attributes
+        assigns(:extent).should eq(extent)
       end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      describe "with valid params" do
-        it "updates the requested extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-        end
 
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-          assigns(:extent).should eq(@extent)
-          response.should be_forbidden
-        end
+      it "redirects to the extent" do
+        extent = Extent.create! valid_attributes
+        put :update, :id => extent.id, :extent => valid_attributes
+        response.should redirect_to(extent)
       end
 
-      describe "with invalid params" do
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @invalid_attrs
-          response.should be_forbidden
-        end
+      it "moves its position when specified" do
+        extent = Extent.create! valid_attributes
+        position = extent.position
+        put :update, :id => extent.id, :move => 'higher'
+        response.should redirect_to extents_url
+        assigns(:extent).position.should eq position - 1
       end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "updates the requested extent" do
-          put :update, :id => @extent.id, :extent => @attrs
-        end
-
-        it "should be forbidden" do
-          put :update, :id => @extent.id, :extent => @attrs
-          response.should redirect_to(new_user_session_url)
-        end
+    describe "with invalid params" do
+      it "assigns the extent as @extent" do
+        extent = Extent.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Extent.any_instance.stub(:save).and_return(false)
+        put :update, :id => extent.id, :extent => {}
+        assigns(:extent).should eq(extent)
       end
 
-      describe "with invalid params" do
-        it "assigns the requested extent as @extent" do
-          put :update, :id => @extent.id, :extent => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
-        end
+      it "re-renders the 'edit' template" do
+        extent = Extent.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Extent.any_instance.stub(:save).and_return(false)
+        put :update, :id => extent.id, :extent => {}
+        #response.should render_template("edit")
       end
     end
   end
 
   describe "DELETE destroy" do
-    before(:each) do
-      @extent = FactoryGirl.create(:extent)
+    it "destroys the requested extent" do
+      extent = Extent.create! valid_attributes
+      expect {
+        delete :destroy, :id => extent.id
+      }.to change(Extent, :count).by(-1)
     end
 
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "destroys the requested extent" do
-        delete :destroy, :id => @extent.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @extent.id
-        response.should be_forbidden
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "destroys the requested extent" do
-        delete :destroy, :id => @extent.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @extent.id
-        response.should be_forbidden
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "destroys the requested extent" do
-        delete :destroy, :id => @extent.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @extent.id
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "destroys the requested extent" do
-        delete :destroy, :id => @extent.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @extent.id
-        response.should redirect_to(new_user_session_url)
-      end
+    it "redirects to the extents list" do
+      extent = Extent.create! valid_attributes
+      delete :destroy, :id => extent.id
+      response.should redirect_to(extents_url)
     end
   end
+
 end