Commit Graph

867 Commits

Author SHA1 Message Date
Rohan Mitchell
c681750698 Move distributor/OC browsing into its own acceptance spec 2013-03-27 11:58:38 +11:00
Rohan Mitchell
a9a58db137 Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query 2013-03-15 12:17:29 +11:00
Rohan Mitchell
f349628202 Test that products by ProductDistribution are not shown 2013-03-15 11:41:58 +11:00
Rohan Mitchell
e326e590db Implement and use scopes for finding products by distributor via order cycle or product distribution 2013-03-08 15:18:53 +11:00
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
Rohan Mitchell
fcb1701d36 WIP Add hub and order cycle display stub with failing tests 2013-03-08 15:18:52 +11:00
Rohan Mitchell
c0431c614f Clean up specs, add spec for selecting both hub and OC 2013-03-08 15:18:52 +11:00
Rohan Mitchell
624a2799aa Create order cycles where needed by tests 2013-03-08 15:18:52 +11:00
Rohan Mitchell
a5c706d694 In test, create a global shipping method, which is required when creating orders 2013-03-08 15:18:52 +11:00
Rohan Mitchell
3aa44c3e9a Setting a remote distributor clears the order cycle, and vice versa 2013-03-08 15:17:23 +11:00
Rohan Mitchell
e1b2490259 Selecting an order cycle highlights valid distributor choices 2013-03-08 15:17:23 +11:00
Rohan Mitchell
74e2b70d3a Without JS, select distributor, highlighting local order cycle choices 2013-03-08 15:17:22 +11:00
Rohan Mitchell
34cb8bab26 View order cycle and distributor choices 2013-03-08 15:15:15 +11:00
Rob H
a59b136864 Spree 1.3 upgrade: fix final failing tests 2013-02-20 15:16:43 +11:00
Rohan Mitchell
fec81b7ed4 Fix failing specs after merge 2013-01-22 11:34:43 +11:00
Rohan Mitchell
f2f3bbd3ed Merge branch 'order-cycles-exchange-products'
Conflicts:
	Gemfile.lock
2013-01-22 10:40:56 +11:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00