255 Commits

Author	SHA1	Message	Date
David Cook	0525abb084	Test that scopes don't return deleted products	2013-06-21 15:53:12 +10:00
David Cook	250e76c281	Fix incorrect count of enterprises (due to bug in rails issue #5554)	2013-06-21 15:10:21 +10:00
David Cook	2e6387ac60	test available_on for distributors	2013-06-21 10:52:15 +10:00
David Cook	38c0552362	test 'more' count	2013-06-21 10:47:04 +10:00
David Cook	1a9fd4a9a8	Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand	2013-06-14 17:40:12 +10:00
David Cook	7933dea611	WIP: add more tests	2013-06-14 17:38:51 +10:00
Rohan Mitchell	063d760047	Merge branch 'master' into supplied-active-products-on-hand	2013-06-14 11:07:24 +10:00
Rohan Mitchell	1e94f88c5e	Ensure order decorator is required, fix test fragility	2013-06-07 15:40:03 +10:00
vagrant	4e7f966429	add suppliers scope, limit by 5, test	2013-05-22 13:07:30 +10:00
Rohan Mitchell	fa11ff8982	Remove more spork-specific things, remove unused cuc config from zeus	2013-04-05 15:25:46 +11:00
Rohan Mitchell	ed7bded642	Remove spork	2013-04-05 15:16:54 +11:00
Rohan Mitchell	5089d3bb22	Add simplecov	2013-03-11 10:57:14 +11:00
Rohan Mitchell	bd5533e2b1	Revert "Add a failing test to test travis" ... This reverts commit 72aa8fe5e5.	2013-02-24 20:22:37 +11:00
Rohan Mitchell	72aa8fe5e5	Add a failing test to test travis	2013-02-24 19:57:57 +11:00
Rob H	a59b136864	Spree 1.3 upgrade: fix final failing tests	2013-02-20 15:16:43 +11:00
Rob H	046eb256ff	Fix issues causing enterprise fee tests to break	2013-02-15 14:10:56 +11:00
Rob H	68246e08d2	Fix stack overflow error in admin shipping method test	2013-02-15 10:34:17 +11:00
Rob H	1ded1bac3f	Lengthen Capybara.default_wait_time for tests that fail due to long load time	2013-02-15 10:31:41 +11:00
Rob H	2f1a9094bf	Fix StaleObjectError in order model test	2013-02-14 16:49:28 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rob H	290f2276cd	Update cms_admin spec work after Spree 1.3 upgrade broke it	2013-02-14 14:03:14 +11:00
Rob H	b924b0c817	Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3)	2013-02-14 12:24:01 +11:00
Rohan Mitchell	5b22cce950	Remove sleeps from specs	2013-01-22 12:12:29 +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	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rohan Mitchell	3f71655bd1	Test updating collection details	2013-01-22 09:44:19 +11:00
Rohan Mitchell	662aaf75bf	When editing an order cycle, distributor collection details are loaded	2013-01-22 09:34:07 +11:00
Rob H	f7890bd94d	Fixes following code review for checkout changes	2013-01-18 19:17:55 +11:00
Rob H	6a45e8be3b	Make tests pass after changes to checkout broke them all	2013-01-18 15:29:36 +11:00
Rohan Mitchell	87d5ffeee2	Add fields for outgoing exchange collection details	2013-01-18 14:24:17 +11:00
Rohan Mitchell	ae93d02c9c	OrderCycleFormApplicator applies outgoing exchange collection details	2013-01-18 14:23:42 +11:00
Rohan Mitchell	a293ea54f9	Update saves distributors and distributed products	2013-01-18 12:13:13 +11:00
Rohan Mitchell	33b9d45f43	Distributors and products displayed on edit	2013-01-18 11:59:32 +11:00
Rohan Mitchell	0a2ce30bb6	Only show variants for distribution that are supplied to the order cycle	2013-01-18 11:52:01 +11:00
Rohan Mitchell	1a0ef85030	Test distributor exchanges are created with order cycles	2013-01-18 11:40:36 +11:00
Rohan Mitchell	983ba92dea	OrderCycleFormApplicator deals with outgoing exchanges	2013-01-18 11:22:42 +11:00
Rohan Mitchell	12dad2468d	Reorder specs	2013-01-17 15:13:41 +11:00
Rohan Mitchell	3991199c30	Only show products for distribution that have been supplied to the order cycle	2013-01-17 10:49:59 +11:00
Rohan Mitchell	850d65958b	Build Enterprise.supplied_products, an array of all products supplied by any enterprise	2013-01-15 12:21:13 +11:00
Rohan Mitchell	488fc2d60e	Upgrade capybara, spec/requests changed to spec/features	2013-01-15 10:10:24 +11:00
Rohan Mitchell	a10eb0d0c7	List and add distributor exchanges	2013-01-11 15:53:51 +11:00
Rohan Mitchell	d3fca565a3	Fix file naming and controller definition/testing	2013-01-11 14:09:56 +11:00
Rohan Mitchell	24a48a9b33	Move enterpriseTotalVariants to Enterprise service	2013-01-11 10:50:03 +11:00
Rohan Mitchell	bb13ec0e02	Rename methods	2013-01-11 10:40:56 +11:00
Rohan Mitchell	d3189e333b	Count selected variants on an exchange	2013-01-11 10:36:27 +11:00
Rohan Mitchell	e46d61075e	Simplify field naming	2013-01-10 15:33:56 +11:00
Rohan Mitchell	4e78fa19a3	Add spec for updating order cycle, minor fixes	2013-01-10 15:29:13 +11:00
Rohan Mitchell	31ea8540ea	Test editing an order cycle - all data is displayed	2013-01-10 15:02:56 +11:00
Rohan Mitchell	d27ef76ead	Load exchange variants from correct attr	2013-01-10 11:27:39 +11:00