Mayvenn/spree — pull request #20 by gmacdougall (2014-12-18 22:34:57+00:00)
Title: Only consider eligible promos for used_by?

Previously this would consider a promo used as long it was assigned to
an order, even if this promo was not eligible (as in the case of when it
was overridden by a better promo).

In order to check if a promo was eligble, it needs to change the way the
associations were joined, as it now needs to check on adjustments
instead of just if the order is associated with the promotion.

The test is changed to set up a full promotion with adjustments, and
actions.

Conflicts:
core/spec/models/spree/promotion_spec.rb