radiant-shop-extension 0.11.5 → 0.11.6

data/spec/models/form_discount_spec.rb

@@ -0,0 +1,63 @@
+require 'spec/spec_helper'
+
+describe FormDiscount do
+  
+  dataset :shop_discounts, :pages, :forms
+  
+  before :each do
+    mock_page_with_request_and_data
+  end
+    
+  describe '#create' do
+    before :each do
+      login_as :customer
+      @order = shop_orders(:several_items)
+    end
+    context 'add' do
+      before :each do
+        mock_valid_form_discount_request
+      end
+      context 'valid discount' do
+        before :each do
+          @discount = FormDiscount.new(@form, @page)
+          @result = @discount.create
+        end
+        it 'should add the discount to the order' do
+          shop_orders(:several_items).discounts.first(:conditions => { :code => '10pcoff' }).should_not be_nil
+        end
+        it 'should return true for result[:add]' do
+          @result[:add].should be_true
+        end
+      end
+      context 'invalid discount' do
+        before :each do
+          @data[:discount][:code] = 'invalid'
+        end
+        it 'should not add the discount to the order' do
+          shop_orders(:several_items).discounts.first(:conditions => { :code => 'invalid' }).should be_nil
+        end
+      end
+    end
+    
+    context 'remove' do
+      before :each do
+        discountable = shop_discounts(:ten_percent).discountables.create(:discounted_id => @order.id, :discounted_type => @order.class.name)
+        
+        mock_valid_form_discount_request
+        @form[:extensions][:discount][:process] = 'remove'
+        @data[:discountable] = { :id => discountable.id }
+        
+        @discount = FormDiscount.new(@form, @page)
+        @result = @discount.create
+      end
+      it 'should remove the discount from the order' do
+        shop_orders(:several_items).discounts.include?(shop_discounts(:ten_percent)).should be_false
+      end  
+      it 'should return true for result[:remove]' do
+        @result[:remove].should be_true
+      end
+    end
+    
+  end
+  
+end

data/spec/models/shop_category_spec.rb

@@ -25,6 +25,14 @@ describe ShopCategory do
     it 'should have a product_layout Layout' do
       @category.product_layout.is_a?(Layout).should be_true
     end
+    
+    it 'should have many discountables' do
+      @category.discountables.is_a?(Array).should be_true
+    end
+    
+    it 'should have many discounts' do
+      @category.discounts.is_a?(Array).should be_true
+    end
   end
   
   describe 'validations' do

data/spec/models/shop_discount_spec.rb

@@ -0,0 +1,130 @@
+require 'spec/spec_helper'
+
+describe ShopDiscount do
+  
+  dataset :shop_discounts, :shop_products, :shop_orders
+
+  describe 'scope' do
+    before :each do
+      @valid   = ShopDiscount.all_including_invalid(:conditions => { :code => '10pcoff'}).first
+      @invalid = ShopDiscount.all_including_invalid(:conditions => { :code => 'invalid'}).first
+    end
+    context 'all' do
+      it 'should not return invalid by default' do
+        ShopDiscount.all.include?(@valid).should   be_true
+        ShopDiscount.all.include?(@invalid).should be_false
+      end
+    end
+    context 'all_including_invalid' do
+      it 'should return all including invalid' do
+        ShopDiscount.all_including_invalid.include?(@valid).should   be_true
+        ShopDiscount.all_including_invalid.include?(@invalid).should be_true
+      end
+    end
+  end
+
+  describe 'validations' do
+    before :each do
+      @discount = shop_discounts(:ten_percent)
+    end
+    
+    context 'name' do
+      it 'should require' do
+        @discount.name = nil
+        @discount.valid?.should === false
+      end
+      it 'should be unique' do
+        @other = shop_discounts(:five_percent)
+        @other.name = @discount.name
+        @other.valid?.should === false
+      end
+    end
+    
+    context 'code' do
+      it 'should require' do
+        @discount.code = nil
+        @discount.valid?.should === false
+      end
+      it 'should be unique' do
+        @other = shop_discounts(:five_percent)
+        @other.code = @discount.code
+        @other.valid?.should === false
+      end
+    end
+    
+    context 'amount' do
+      it 'should require' do
+        @discount.amount = nil
+        @discount.valid?.should === false
+      end
+      it 'should be numerical' do
+        @discount.amount = 'failure'
+        @discount.valid?.should === false
+      end
+    end
+  end
+  
+  describe 'relationships' do
+    before :each do
+      @discount = shop_discounts(:five_percent)
+    end
+    context 'categories' do
+      before :each do
+        @bread = shop_categories(:bread)
+      end
+      it 'should have many' do
+        @discount.discountables.create(:discounted => @bread)
+        @discount.categories.include?(@bread).should === true
+      end
+      context '#for' do
+        before :each do
+          @discount.discountables.create(:discounted => shop_categories(:bread))
+          @discount.discountables.create(:discounted => shop_categories(:milk))
+          @discount.discountables.create(:discounted => shop_products(:crusty_bread))
+          @discount.discountables.create(:discounted => shop_products(:full_milk))
+        end
+        it 'should return result of only that type' do
+          discountables = @discount.discountables.for('ShopCategory')
+          discountables.each do |d|
+            d.discounted.is_a?(ShopCategory).should === true
+          end
+        end
+        it 'should return result of only that type regardless of string format' do
+          discountables = @discount.discountables.for('Shop_category')
+          discountables.each do |d|
+            d.discounted.is_a?(ShopCategory).should === true
+          end
+          
+          discountables = @discount.discountables.for('shop_category')
+          discountables.each do |d|
+            d.discounted.is_a?(ShopCategory).should === true
+          end
+          
+          discountables = @discount.discountables.for('ShopProduct')
+          discountables.each do |d|
+            d.discounted.is_a?(ShopProduct).should === true
+          end
+        end
+      end
+    end
+  end
+  
+  describe '#available_categories' do
+    before :each do
+      @discount = shop_discounts(:ten_percent)
+    end
+    it 'should return all categories minus its own' do
+      @discount.available_categories.should === ShopCategory.all - @discount.categories
+    end
+  end
+  
+  describe '#available_products' do
+    before :each do
+      @discount = shop_discounts(:ten_percent)
+    end
+    it 'should return all products minus its own' do
+      @discount.available_products.should === ShopProduct.all - @discount.products
+    end
+  end
+  
+end

data/spec/models/shop_discountable_spec.rb

@@ -0,0 +1,114 @@
+require 'spec/spec_helper'
+
+describe ShopDiscountable do
+  
+  dataset :shop_discountables, :shop_line_items
+  
+  before(:each) do
+    @discount  = shop_discounts(:ten_percent)
+  end
+  
+  describe 'validations' do
+    before :each do
+      @discountable = shop_discountables(:ten_percent_bread)
+    end
+    
+    context 'discount' do
+      it 'should require' do
+        @discountable.discount = nil
+        @discountable.valid?.should === false
+      end
+    end
+    
+    context 'discounted' do
+      it 'should require' do
+        @discountable.discounted = nil
+        @discountable.valid?.should === false
+      end
+      it 'should be unique to the class' do
+        @other = ShopDiscountable.new(:discount => @discount, :discounted => @discountable.discounted)
+        @other.valid?.should === false
+        
+        @other.discounted = shop_categories(:milk)
+        @other.valid?.should === true
+      end
+    end
+  end
+  
+  describe 'category and product hooks' do
+    describe '#create' do
+      before :each do
+        @discount = shop_discounts(:one_percent)
+        @category = shop_categories(:milk)
+        
+        discountable = @discount.discountables.create(:discounted => @category)      
+      end
+      it 'should assign the category to the discount' do
+        @discount.categories.include?(@category).should be_true
+      end
+      it 'should assign the products to that category' do
+        @discount.products.should_not be_empty
+        @discount.products.should === @category.products
+      end
+    end
+  
+    describe '#destroy' do
+      before :each do
+        @discount = shop_discounts(:one_percent)
+        @category = shop_categories(:milk)
+        
+        discountable = @discount.discountables.create(:discounted => @category)
+        discountable.destroy
+      end
+      it 'should remove the category to the discount' do
+        @discount.categories.include?(@category).should be_false
+      end
+      it 'should remove the products of that category' do
+        @category.products.each do |p|
+          @discount.products.include?(p).should be_false
+        end
+      end
+    end
+  end
+  
+  describe 'order and line_item hooks' do
+    before :each do      
+      @discount = shop_discounts(:one_percent)
+      @order    = shop_orders(:several_items)
+      @line_item_one = shop_orders(:several_items).line_items.first
+      @line_item_two = shop_orders(:several_items).line_items.last
+      
+      # Creates a discount for the items product
+      @discount.discountables.create(:discounted_id => @line_item_one.item.id, :discounted_type => @line_item_one.item.class.name)
+    end
+    describe '#create' do
+      before :each do
+        discountable = @discount.discountables.create(:discounted => @order)
+      end
+      it 'should assign the category to the discount' do
+        @discount.orders.include?(@order).should be_true
+      end
+      it 'should assign only the items with discounted products to that category' do
+        @discount.line_items.should_not be_empty
+        @discount.line_items.include?(@line_item_one).should be_true
+        @discount.line_items.include?(@line_item_two).should be_false
+      end
+    end
+  
+    describe '#destroy' do
+      before :each do
+        discountable = @discount.discountables.create(:discounted => @order)
+        discountable.destroy
+      end
+      it 'should remove the category to the discount' do
+        @discount.orders.include?(@order).should be_false
+      end
+      it 'should remove the products of that category' do
+        @order.line_items.each do |p|
+          @discount.line_items.include?(p).should be_false
+        end
+      end
+    end
+  end
+  
+end

data/spec/models/shop_line_item_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe ShopLineItem do
   
-  dataset :shop_line_items, :shop_products
+  dataset :shop_line_items, :shop_products, :shop_discountables
 
   it 'should calculate a weight' do
     shop_line_items(:one).weight.should === (shop_line_items(:one).item.weight * shop_line_items(:one).quantity).to_f
@@ -14,6 +14,14 @@ describe ShopLineItem do
     shop_line_items(:two).price.should === (shop_line_items(:two).item.price * shop_line_items(:two).quantity).to_f
   end
   
+  context 'with discount' do
+    it 'should calculate a reduced price' do
+      price = shop_line_items(:one).price
+      ShopDiscountable.create(:discount => shop_discounts(:ten_percent), :discounted => shop_line_items(:one))
+      shop_line_items(:one).price.should === (price-price*0.1)
+    end
+  end
+  
   it 'should have a set of standard parameters' do
     ShopLineItem.params.should === [
       :id,

data/spec/models/shop_order_spec.rb

@@ -3,239 +3,293 @@ require 'spec/spec_helper'
 describe ShopOrder do
 
   dataset :shop_orders, :shop_line_items, :shop_products, :shop_packages, :shop_payments
+  
+  describe '#quantity' do
+    it 'should return the total items' do
+      shop_orders(:empty).quantity.should         === shop_orders(:empty).line_items.sum(:quantity)
+      shop_orders(:several_items).quantity.should === shop_orders(:several_items).line_items.sum(:quantity)
+    end
+  end
+  
+  describe '#weight' do
+    it 'should calculate a total weight' do
+      shop_orders(:empty).weight.should           === lambda{ weight = 0; shop_orders(:empty).line_items.map { |l| weight += l.weight }; weight }.call
+      shop_orders(:several_items).weight.should   === lambda{ weight = 0; shop_orders(:several_items).line_items.map { |l| weight += l.weight }; weight }.call
+    end
+  end
 
-  context 'instance' do
-    describe 'accessors' do
-      it 'should return the total items' do
-        shop_orders(:empty).quantity.should         === shop_orders(:empty).line_items.sum(:quantity)
-        shop_orders(:one_item).quantity.should      === shop_orders(:one_item).line_items.sum(:quantity)
-        shop_orders(:several_items).quantity.should === shop_orders(:several_items).line_items.sum(:quantity)
+  describe '#price' do
+    context 'inclusive tax' do
+      it 'should calculate from the line items alone' do
+        Radiant::Config['shop.tax_strategy'] = 'inclusive'
+        
+        shop_orders(:empty).price.should            === lambda{ price = 0; shop_orders(:empty).line_items.map { |l| price += l.price }; price }.call
+        shop_orders(:several_items).price.should    === lambda{ price = 0; shop_orders(:several_items).line_items.map { |l| price += l.price }; price }.call
+      end
+    end
+    context 'exclusive tax' do
+      it 'should calculate from the line items and tax' do
+        Radiant::Config['shop.tax_strategy']   = 'exclusive'
+        Radiant::Config['shop.tax_percentage'] = 10
+        
+        shop_orders(:empty).price.should            === lambda{ price = 0; shop_orders(:empty).line_items.map { |l| price += l.price }; price += shop_orders(:empty).tax }.call
+        shop_orders(:several_items).price.should    === lambda{ price = 0; shop_orders(:several_items).line_items.map { |l| price += l.price }; price += shop_orders(:several_items).tax }.call
+      end
+    end
+  end
+  
+  describe '#new?' do
+    context 'success' do
+      it 'should return true' do
+        shop_orders(:one_item).update_attribute(:status, 'new')
+        shop_orders(:one_item).new?.should === true
       end
+    end
+    context 'failure' do
+      it 'should return false' do
+        shop_orders(:one_item).update_attribute(:status, 'paid')
+        shop_orders(:one_item).new?.should === false
 
-      it 'should calculate a total weight' do
-        shop_orders(:empty).weight.should           === lambda{ weight = 0; shop_orders(:empty).line_items.map { |l| weight += l.weight }; weight }.call
-        shop_orders(:one_item).weight.should        === lambda{ weight = 0; shop_orders(:one_item).line_items.map { |l| weight += l.weight }; weight }.call
-        shop_orders(:several_items).weight.should   === lambda{ weight = 0; shop_orders(:several_items).line_items.map { |l| weight += l.weight }; weight }.call
+        shop_orders(:one_item).update_attribute(:status, 'shipped')
+        shop_orders(:one_item).new?.should === false
       end
+    end
+  end
+  describe '#shipped?' do
+    context 'success' do
+      it 'should return true' do
+        shop_orders(:one_item).update_attribute(:status, 'shipped')
+        shop_orders(:one_item).shipped?.should === true
+      end
+    end
+    context 'failure' do
+      it 'should return false' do
+        shop_orders(:one_item).update_attribute(:status, 'new')
+        shop_orders(:one_item).shipped?.should === false
 
-      it 'should calculate the total price' do
-        shop_orders(:empty).price.should            === lambda{ price = 0; shop_orders(:empty).line_items.map { |l| price += l.price }; price }.call
-        shop_orders(:one_item).price.should         === lambda{ price = 0; shop_orders(:one_item).line_items.map { |l| price += l.price }; price }.call
-        shop_orders(:several_items).price.should    === lambda{ price = 0; shop_orders(:several_items).line_items.map { |l| price += l.price }; price }.call
+        shop_orders(:one_item).update_attribute(:status, 'paid')
+        shop_orders(:one_item).shipped?.should === false
       end
-      
-      describe '#new?' do
-        context 'success' do
-          it 'should return true' do
-            shop_orders(:one_item).update_attribute(:status, 'new')
-            shop_orders(:one_item).new?.should === true
-          end
+    end
+  end
+  describe '#paid?' do
+    context 'success' do
+      it 'should return true' do
+        shop_orders(:several_items).update_attribute(:status, 'paid')
+        
+        shop_orders(:several_items).payment.should  === shop_payments(:visa)
+        shop_orders(:several_items).paid?.should    === true
+      end
+    end
+    context 'failure' do
+      describe 'status is not paid' do
+        it 'should return false' do
+          shop_orders(:several_items).update_attribute(:status, 'new')
+          shop_orders(:several_items).paid?.should === false
         end
-        context 'failure' do
-          it 'should return false' do
-            shop_orders(:one_item).update_attribute(:status, 'paid')
-            shop_orders(:one_item).new?.should === false
-
-            shop_orders(:one_item).update_attribute(:status, 'shipped')
-            shop_orders(:one_item).new?.should === false
-          end
+      end
+      describe 'payment is nil' do
+        it 'should return false' do
+          shop_orders(:several_items).update_attribute(:status, 'paid')
+          shop_orders(:several_items).payment = nil
+          shop_orders(:several_items).paid?.should === false
         end
       end
-      describe '#shipped?' do
-        context 'success' do
-          it 'should return true' do
-            shop_orders(:one_item).update_attribute(:status, 'shipped')
-            shop_orders(:one_item).shipped?.should === true
-          end
+      describe 'payment amount doesnt match' do
+        it 'should return false' do
+          shop_orders(:several_items).update_attribute(:status, 'paid')
+          shop_orders(:several_items).payment.update_attribute(:amount, 11.00)
+          shop_orders(:several_items).paid?.should === false
         end
-        context 'failure' do
-          it 'should return false' do
-            shop_orders(:one_item).update_attribute(:status, 'new')
-            shop_orders(:one_item).shipped?.should === false
-
-            shop_orders(:one_item).update_attribute(:status, 'paid')
-            shop_orders(:one_item).shipped?.should === false
-          end
+      end
+    end
+  end
+    
+  describe '#add!' do   
+    context 'item not in cart' do
+      before :each do
+        @order = shop_orders(:empty)
+        @product = shop_products(:crusty_bread)
+      end
+      context 'no quantity or type passed' do
+        it 'should assign a default type and default quantity' do
+          @order.add!(@product.id)
+          
+          @order.line_items.count.should           === 1
+          @order.line_items.first.item_type.should === 'ShopProduct'
+          @order.line_items.first.quantity.should  === 1
+          @order.line_items.first.item.should      === @product
         end
       end
-      describe '#paid?' do
-        context 'success' do
-          it 'should return true' do
-            shop_orders(:several_items).update_attribute(:status, 'paid')
-            
-            shop_orders(:several_items).payment.should  === shop_payments(:visa)
-            shop_orders(:several_items).paid?.should    === true
-          end
+      context 'quantity passed' do
+        it 'should assign the default type and new quantity' do
+          @order.add!(@product.id, 2)
+          
+          @order.line_items.count.should           === 1
+          @order.line_items.first.item_type.should === 'ShopProduct'
+          @order.line_items.first.quantity.should  === 2
+          @order.line_items.first.item.should      === @product              
         end
-        context 'failure' do
-          describe 'status is not paid' do
-            it 'should return false' do
-              shop_orders(:several_items).update_attribute(:status, 'new')
-              shop_orders(:several_items).paid?.should === false
-            end
-          end
-          describe 'payment is nil' do
-            it 'should return false' do
-              shop_orders(:several_items).update_attribute(:status, 'paid')
-              shop_orders(:several_items).payment = nil
-              shop_orders(:several_items).paid?.should === false
-            end
-          end
-          describe 'payment amount doesnt match' do
-            it 'should return false' do
-              shop_orders(:several_items).update_attribute(:status, 'paid')
-              shop_orders(:several_items).payment.update_attribute(:amount, 11.00)
-              shop_orders(:several_items).paid?.should === false
-            end
-          end
+      end
+      context 'type and quantity passed' do
+        it 'should assign the new type and new quantity' do
+          @order.add!(shop_packages(:all_bread).id, 2, 'ShopPackage')
+          
+          @order.line_items.count.should           === 1
+          @order.quantity.should                   === 2
+          @order.line_items.first.item_type.should === 'ShopPackage'
+        end
+      end
+    end
+    context 'item in cart' do
+      before :each do
+        @order      = shop_orders(:one_item)
+        @line_item  = @order.line_items.first
+      end
+      context 'no quantity or type passed' do
+        it 'should assign a default type and default quantity' do
+          @order.add!(@line_item.id)
+          
+          @order.line_items.count.should === 1
+          @order.quantity.should         === 1
+        end
+      end
+      context 'quantity passed' do
+        it 'should assign the default type and new quantity' do
+          @order.add!(@line_item.id, 2)
+          
+          @order.line_items.count.should === 1
+          @order.quantity.should         === 3
+        end
+      end
+    end
+  end
+  describe '#modify!' do
+    context 'quantity not set' do
+      before :each do
+        @order = shop_orders(:one_item)
+        @line_item = @order.line_items.first
+      end
+      it 'should not update the item' do
+        @order.modify!(@line_item.id)
+        
+        @order.quantity.should === 1
+      end
+    end
+    context 'quantity set' do
+      before :each do
+        @order = shop_orders(:one_item)
+        @line_item = @order.line_items.first
+      end
+      context 'quantity > 0' do
+        it 'should assign that quantity' do
+          @order.modify!(@line_item.id, 1)
+          @order.quantity.should === 1
+          
+          @order.modify!(@line_item.id, 2)
+          @order.quantity.should === 2
+          
+          @order.modify!(@line_item.id, 100)
+          @order.quantity.should === 100
+        end
+      end
+      context 'quantity <= 0' do
+        it 'should remove that item for 0' do
+          @order.modify!(@line_item.id, 0)
+          @order.quantity.should === 0         
+        end
+        it 'should remove that item for -1' do
+          @order.modify!(@line_item.id, -1)
+          @order.quantity.should === 0
+        end
+        it 'should remove that item for -100' do
+          @order.modify!(@line_item.id, -100)
+          @order.quantity.should === 0
         end
       end
     end
+  end
+  describe '#remove!' do
+    it 'should remove the item' do
+      @order = shop_orders(:several_items)
+      items = @order.line_items.count
+      
+      @order.remove!(@order.line_items.first.id)
+      @order.line_items.count.should === items - 1
+    end
+  end
+  describe '#clear!' do
+    it 'should remove all items' do
+      @order = shop_orders(:several_items)
+      @order.clear!
+      @order.quantity.should === 0
+    end
+  end
   
-    describe 'mutators' do
-      describe '#add!' do   
-        context 'item not in cart' do
-          before :each do
-            @order = shop_orders(:empty)
-            @product = shop_products(:crusty_bread)
-          end
-          context 'no quantity or type passed' do
-            it 'should assign a default type and default quantity' do
-              @order.add!(@product.id)
-              
-              @order.line_items.count.should           === 1
-              @order.line_items.first.item_type.should === 'ShopProduct'
-              @order.line_items.first.quantity.should  === 1
-              @order.line_items.first.item.should      === @product
-            end
-          end
-          context 'quantity passed' do
-            it 'should assign the default type and new quantity' do
-              @order.add!(@product.id, 2)
-              
-              @order.line_items.count.should           === 1
-              @order.line_items.first.item_type.should === 'ShopProduct'
-              @order.line_items.first.quantity.should  === 2
-              @order.line_items.first.item.should      === @product              
-            end
-          end
-          context 'type and quantity passed' do
-            it 'should assign the new type and new quantity' do
-              @order.add!(shop_packages(:all_bread).id, 2, 'ShopPackage')
-              
-              @order.line_items.count.should           === 1
-              @order.quantity.should                   === 2
-              @order.line_items.first.item_type.should === 'ShopPackage'
-            end
+  describe '.scope_by_status' do
+    context 'no scoping' do
+      before :each do
+        @orders = ShopOrder.count
+      end
+      context 'nil' do
+        it 'should return all' do
+          ShopOrder.scope_by_status(nil) do
+            ShopOrder.count.should === @orders
           end
         end
-        context 'item in cart' do
-          before :each do
-            @order      = shop_orders(:one_item)
-            @line_item  = @order.line_items.first
-          end
-          context 'no quantity or type passed' do
-            it 'should assign a default type and default quantity' do
-              @order.add!(@line_item.id)
-              
-              @order.line_items.count.should === 1
-              @order.quantity.should         === 1
-            end
-          end
-          context 'quantity passed' do
-            it 'should assign the default type and new quantity' do
-              @order.add!(@line_item.id, 2)
-              
-              @order.line_items.count.should === 1
-              @order.quantity.should         === 3
-            end
+      end
+      context 'blank' do
+        it 'should return all' do
+          ShopOrder.scope_by_status('') do
+            ShopOrder.count.should === @orders
           end
         end
       end
-      describe '#modify!' do
-        context 'quantity not set' do
-          before :each do
-            @order = shop_orders(:one_item)
-            @line_item = @order.line_items.first
-          end
-          it 'should not update the item' do
-            @order.modify!(@line_item.id)
-            
-            @order.quantity.should === 1
+      context 'missing' do
+        it 'should return all' do
+          ShopOrder.scope_by_status('this_status_shall_never_be_real') do
+            ShopOrder.count.should === @orders
           end
         end
-        context 'quantity set' do
-          before :each do
-            @order = shop_orders(:one_item)
-            @line_item = @order.line_items.first
-          end
-          context 'quantity > 0' do
-            it 'should assign that quantity' do
-              @order.modify!(@line_item.id, 1)
-              @order.quantity.should === 1
-              
-              @order.modify!(@line_item.id, 2)
-              @order.quantity.should === 2
-              
-              @order.modify!(@line_item.id, 100)
-              @order.quantity.should === 100
-            end
-          end
-          context 'quantity <= 0' do
-            it 'should remove that item for 0' do
-              @order.modify!(@line_item.id, 0)
-              @order.quantity.should === 0         
-            end
-            it 'should remove that item for -1' do
-              @order.modify!(@line_item.id, -1)
-              @order.quantity.should === 0
-            end
-            it 'should remove that item for -100' do
-              @order.modify!(@line_item.id, -100)
-              @order.quantity.should === 0
-            end
+      end
+    end
+    context 'scoping' do
+      before :each do
+        ShopOrder.create(:status => 'new')
+        ShopOrder.create(:status => 'shipped')
+        ShopOrder.create(:status => 'paid')
+      end
+      context 'new' do
+        it 'should return matching count' do
+          @orders = ShopOrder.all(:conditions => { :status => 'new' }).count
+          ShopOrder.scope_by_status('new') do
+            ShopOrder.count.should === @orders
           end
         end
       end
-      describe '#remove!' do
-        it 'should remove the item' do
-          @order = shop_orders(:several_items)
-          items = @order.line_items.count
-          
-          @order.remove!(@order.line_items.first.id)
-          @order.line_items.count.should === items - 1
+      context 'shipped' do
+        it 'should return matching count' do
+          @orders = ShopOrder.all(:conditions => { :status => 'shipped' }).count
+          ShopOrder.scope_by_status('shipped') do
+            ShopOrder.count.should === @orders
+          end
         end
       end
-      describe '#clear!' do
-        it 'should remove all items' do
-          @order = shop_orders(:several_items)
-          @order.clear!
-          @order.quantity.should === 0
+      context 'paid' do
+        it 'should return matching count' do
+          @orders = ShopOrder.all(:conditions => { :status => 'paid' }).count
+          ShopOrder.scope_by_status('paid') do
+            ShopOrder.count.should === @orders
+          end
         end
       end
     end
   end
   
-  context 'class methods' do
-    describe '#search' do
-      context 'status' do
-        it 'should return valid subsets' do
-          count = ShopOrder.count
-          
-          old = ShopOrder.first
-          old.update_attribute(:status, 'paid')
-          
-          results = ShopOrder.search('new')
-          results.count.should === count - 1
-        end
-      end
-    end
-    
-    describe '#params' do
-      it 'should have a set of standard parameters' do
-        ShopOrder.params.should === [ :id, :notes, :status ]
-      end
+  describe '.params' do
+    it 'should have a set of standard parameters' do
+      ShopOrder.params.should === [ :id, :notes, :status ]
     end
   end
-
+  
 end