Rohan Mitchell 1285d507eb Revert "Create order cycles where needed by tests" ...

This reverts commit b82e0007c9b0322e85e5597634628024e839d102.

Conflicts:

	spec/factories.rb
	spec/features/consumer/order_cycles_spec.rb

2013-03-08 15:18:53 +11:00

..

controllers

In test, create a global shipping method, which is required when creating orders

2013-03-08 15:18:52 +11:00

features

Revert "Create order cycles where needed by tests"

2013-03-08 15:18:53 +11:00

helpers

Selecting an order cycle highlights valid distributor choices

2013-03-08 15:17:23 +11:00

javascripts/unit

Only show variants for distribution that are supplied to the order cycle

2013-01-18 11:52:01 +11:00

lib

Revert "Add a failing test to test travis"

2013-02-24 20:22:37 +11:00

models

Keep old methods available for product distribution queries

2013-03-08 15:18:52 +11:00

support

In test, create a global shipping method, which is required when creating orders

2013-03-08 15:18:52 +11:00

factories.rb

Write new query for Product#in_distributor that queries order cycles instead of product_distributions

2013-03-08 15:18:52 +11:00

spec_helper.rb

Fix failing specs after merge

2013-01-22 11:34:43 +11:00