Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +11:00

..

ability_spec.rb

Adding destroy ability to enterprise users

2013-12-13 15:40:23 +11:00

addresses_spec.rb

Move spree model decorator specs into their own dir to mirror model dir layout

2013-10-17 09:53:54 +11:00

adjustment_spec.rb

Move spree model decorator specs into their own dir to mirror model dir layout

2013-10-17 09:53:54 +11:00

line_item_spec.rb

Move spree model decorator specs into their own dir to mirror model dir layout

2013-10-17 09:53:54 +11:00

order_populator_spec.rb

Removing redundant functionality from the Order Populator

2014-01-08 14:45:40 +11:00

order_spec.rb

Fixing up the failing spec for distributor changes, reworking a method to SharedHelper

2013-11-07 11:47:05 +11:00

payment_method_spec.rb

Sort payment methods by name

2013-11-21 14:42:28 +11:00

product_spec.rb

Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.

2014-01-07 10:36:19 +11:00

shipping_method_spec.rb

Fix sorting error in spec

2014-01-08 14:43:46 +11:00

variant_spec.rb

Remove redundant test stubs

2014-01-10 15:44:16 +11:00