spec/unit/resource_controller/collection_spec.rb in activeadmin-0.4.4 vs spec/unit/resource_controller/collection_spec.rb in activeadmin-0.5.0.pre

@@ -24,11 +24,33 @@
 
   describe ActiveAdmin::ResourceController::Collection::Sorting do
     let(:params){ {:order => "id_asc" }}
     it "should prepend the table name" do
       chain = mock("ChainObj")
-      chain.should_receive(:order).with("\"posts\".\"id\" asc").once.and_return(Post.search)
+      chain.should_receive(:reorder).with("\"posts\".\"id\" asc").once.and_return(Post.search)
       controller.send :sort_order, chain
     end
   end
+  
+  describe ActiveAdmin::ResourceController::Collection::Scoping, "#scope_current_collection" do
+    context "when no current scope" do
+      it "should set collection_before_scope to the chain and return the chain" do
+        chain = mock("ChainObj")
+        controller.send(:scope_current_collection, chain).should == chain
+        controller.send(:collection_before_scope).should == chain
+      end
+    end
 
+    context "when current scope" do
+      it "should set collection_before_scope to the chain and return the scoped chain" do
+        chain = mock("ChainObj")
+        scoped_chain = mock("ScopedChain")
+        current_scope = mock("CurrentScope")
+        controller.stub!(:current_scope) { current_scope }
+
+        controller.should_receive(:scope_chain).with(current_scope, chain) { scoped_chain }
+        controller.send(:scope_current_collection, chain).should == scoped_chain
+        controller.send(:collection_before_scope).should == chain
+      end
+    end
+  end
 end