Exclude Expired Promotions from possible_promotions

promo/app/models/spree/product_decorator.rb

@@ -2,8 +2,7 @@
   has_and_belongs_to_many :promotion_rules, :join_table => :spree_products_promotion_rules
 
   def possible_promotions
-    all_rules = promotion_rules
-    promotion_ids = all_rules.map(&:activator_id).uniq
-    Spree::Promotion.advertised.where(:id => promotion_ids)
+    promotion_ids = promotion_rules.map(&:activator_id).uniq
+    Spree::Promotion.advertised.where(:id => promotion_ids).reject(&:expired?)
   end
 end

promo/spec/requests/promotion_adjustments_spec.rb

@@ -24,6 +24,24 @@
 
     let!(:address) { create(:address, :state => Spree::State.first) }
 
+    it "should properly populate Spree::Product#possible_promotions" do
+      promotion = create_per_product_promotion 'RoR Mug', 5.0
+      promotion.update_column :advertise, true
+
+      mug = Spree::Product.find_by_name 'RoR Mug'
+      bag = Spree::Product.find_by_name 'RoR Bag'
+
+      mug.possible_promotions.size.should == 1
+      bag.possible_promotions.size.should == 0
+
+      # expire the promotion
+      promotion.expires_at = Date.today.beginning_of_week
+      promotion.starts_at = Date.today.beginning_of_week.advance(:day => 3)
+      promotion.save!
+
+      mug.possible_promotions.size.should == 0
+    end
+
     it "should allow an admin to create a flat rate discount coupon promo" do
       fill_in "Name", :with => "Order's total > $30"
       fill_in "Usage Limit", :with => "100"
@@ -422,12 +440,15 @@
       Spree::Order.last.total.to_f.should == 54.00
     end
 
-    def create_per_product_promotion product_name, discount_amount
+    def create_per_product_promotion product_name, discount_amount, event = "Add to cart"
+      promotion_name = "Bundle d#{discount_amount}"
+
       visit spree.admin_path
       click_link "Promotions"
       click_link "New Promotion"
-      fill_in "Name", :with => "Bundle"
-      select "Add to cart", :from => "Event"
+
+      fill_in "Name", :with => promotion_name
+      select event, :from => "Event"
       click_button "Create"
       page.should have_content("Editing Promotion")
 
@@ -449,6 +470,8 @@ def create_per_product_promotion product_name, discount_amount
       within('#actions_container') { click_button "Update" }
       within('.calculator-fields') { fill_in "Amount", :with => discount_amount.to_s }
       within('#actions_container') { click_button "Update" }
+
+      Spree::Promotion.find_by_name promotion_name
     end
 
     def add_to_cart product_name
@@ -474,34 +497,5 @@ def do_checkout
       fill_in "card_code", :with => "123"
       click_button "Save and Continue"
     end
-
-    def create_per_product_promotion product_name, discount_amount
-      visit spree.admin_path
-      click_link "Promotions"
-      click_link "New Promotion"
-      fill_in "Name", :with => "Bundle"
-      select "Add to cart", :from => "Event"
-      click_button "Create"
-      page.should have_content("Editing Promotion")
-
-      # add product_name to last promotion
-      promotion = Spree::Promotion.last
-      promotion.rules << Spree::Promotion::Rules::Product.new()
-      product = Spree::Product.find_by_name(product_name)
-      rule = promotion.rules.last
-      rule.products << product
-      if rule.save
-        puts "Created promotion: new price for #{product_name} is #{product.price - discount_amount} (was #{product.price})"
-      else
-        puts "Failed to create promotion: price for #{product_name} is still #{product.price}"
-      end
-
-      select "Create adjustment", :from => "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Flat Rate (per item)", :from => "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", :with => discount_amount.to_s }
-      within('#actions_container') { click_button "Update" }
-    end
   end
 end