Rohan Mitchell 734b2fc766 Merge branch 'master' into redesign-cms

2015-07-31 14:59:33 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Fix controller spec for extraction of report controller logic

2015-07-24 14:10:04 +10:00

features

Auto-merge from CI [skip ci]

2015-07-29 12:03:03 +10:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Fix date spec error

2015-07-31 14:59:05 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

lib

Add helper support to Reports DSL

2015-07-23 11:45:19 +10:00

mailers

Adding a ship address to order in spec

2015-03-01 12:22:06 +11:00

models

Rewrite alias_method_chain to use super. Ahhhhh :)

2015-07-17 16:06:50 +10:00

performance

Fix currency issues, changed logo path

2015-06-18 15:38:46 +10:00

requests

scoping down large request spec

2015-06-10 13:50:55 +10:00

serializers

Switching enterprise index to its own dedicated serializer, so we can spit out ownership

2015-06-12 01:49:37 +08:00

support

Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec

2015-06-11 14:16:18 +10:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Auto-merge from CI [skip ci]

2015-06-16 14:12:16 +10:00

spec_helper.rb

Make config reset for all tests more robust. Add cache isolation for parallel specs.

2015-06-24 14:02:45 +10:00