End of day commit

spec/models/list_spec.rb

@@ -39,6 +39,14 @@ describe List do
     it 'takes the product_order price in stead of the product price' do
       product_order and list.set_price.should == 6.33
     end
+
+    it 'does not include the price of cancelled orders' do
+      product_order
+      cancelled = create :order, :cancelled, user: user, list: list, supplier: supplier, section: section
+      create :product_order, order: cancelled, product: product, quantity: 2, price: 7.99
+      list.set_price
+      list.price.should == 6.33
+    end
   end
 
   describe '#move_to_table!' do