120 Commits

Author	SHA1	Message	Date
Rohan Mitchell	16847025dd	Fix bug: local storage was not correctly keyed to user id	2014-08-08 11:14:50 +10:00
Rohan Mitchell	769e8410cc	Fix checkout total display	2014-08-07 14:53:30 +10:00
Rohan Mitchell	a1dd5dabac	Replace sleep with wait, add cart_dirty spec helper	2014-07-31 11:36:53 +10:00
Will Marshall	20d7484134	Merge branch 'master' into laura_and_will ... Conflicts: app/assets/javascripts/darkswarm/services/order.js.coffee	2014-07-28 13:43:31 +10:00
Will Marshall	a5f478bde7	Ajax submission of max quantity	2014-07-28 13:33:13 +10:00
Will Marshall	39f9e991ad	Minor regressions and bug fixes	2014-07-28 11:30:35 +10:00
Rohan Mitchell	f73a63e944	Switch spec to better spree paypal express payment method	2014-07-25 13:47:31 +10:00
Will Marshall	f316b8dec5	Adding product modals in new format	2014-06-27 15:15:41 +10:00
Will Marshall	369761ccc5	Minor regression bug	2014-06-24 17:15:31 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Will Marshall	8905b45333	Fixing a minor regression	2014-06-19 12:10:05 +10:00
Will Marshall	bc93ce57e6	Smooth scrolling, svg support via directive	2014-06-13 11:00:28 +10:00
Will Marshall	7a062b0310	Reworking the variant display of units and names	2014-06-12 16:13:51 +10:00
Rohan Mitchell	71020a14ef	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-12 11:49:54 +10:00
Rohan Mitchell	f068cb3cd7	Show shipping method via angular only (don't show spree's adjustment)	2014-06-06 17:05:50 +10:00
Rohan Mitchell	be644bdcc3	Revert "Reworking flash messages hooray" ... This reverts commit c9d0091cd9.	2014-06-06 16:59:47 +10:00
Will Marshall	c9d0091cd9	Reworking flash messages hooray	2014-06-06 16:41:28 +10:00
Rohan Mitchell	566afc0b75	Merge branch 'laura_and_will'	2014-06-05 11:42:02 +10:00
Rohan Mitchell	f28d9f9d9b	Fix distributor logo spec - Add a logo	2014-06-05 11:38:27 +10:00
Rohan Mitchell	4a7609a835	Basic styling for checkout credit card form	2014-06-05 11:17:53 +10:00
Rohan Mitchell	37c780ed70	WIP: Send credit card details to server on checkout	2014-06-04 16:20:48 +10:00
Rohan Mitchell	d4f65a63bb	Remove spec for removed image	2014-06-03 11:31:30 +10:00
Will Marshall	206c947ea5	Tweaking test	2014-05-30 12:20:18 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	5b2e9e9c30	Final set of regression issues	2014-05-09 16:43:57 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Will Marshall	631bef223c	Refactoring checkout test	2014-05-09 16:42:51 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
Will Marshall	998fb07330	Splitting out the accordion stuff for checkout	2014-05-08 16:07:56 +10:00
Rob H	169d5669f1	Amend specs	2014-05-07 13:34:47 +10:00
Will Marshall	549b41d6fe	Patching a spec issue with occlusion	2014-05-06 18:28:55 +10:00
Will Marshall	1e7e1a3127	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork ... Conflicts: spec/features/consumer/shopping/checkout_spec.rb	2014-05-02 16:12:41 +10:00
Rohan Mitchell	901c9abe38	Increase wait time for failing spec	2014-05-02 15:39:17 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rohan Mitchell	1d5f0042d4	Remove sleeps - these should be covered by increased capybara wait time now	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Will Marshall	dfd1dd609d	Re-engaging checkout spec	2014-05-02 14:13:00 +10:00
Will Marshall	34f170d4f7	Bugged thing in the shop spec	2014-05-02 10:18:57 +10:00
Will Marshall	1703f7503b	Removing dead weight	2014-05-01 17:43:02 +10:00
Will Marshall	2d536e01e7	Patching some deadlocks	2014-05-01 17:21:46 +10:00
Will Marshall	59d2bc908e	Adding quick login, more test refactoring	2014-05-01 17:11:56 +10:00
Will Marshall	6ad30d901d	Tidying down shop/checkout test	2014-05-01 16:22:11 +10:00
Will Marshall	2ff2d3dcbd	Starting to work on test format	2014-05-01 15:51:40 +10:00
Will Marshall	e08f0a5feb	Removing a feature spec BECAUSE we've got the same tests in the controller spec baby	2014-04-30 10:06:46 +10:00
Will Marshall	06c10515dc	Patching a bug	2014-04-29 16:40:23 +10:00
Will Marshall	3e1dce4d18	Removing an archived spec	2014-04-29 16:19:21 +10:00
Will Marshall	a3252283af	Re-engaging the authentication specs for checkout	2014-04-29 15:29:37 +10:00
Will Marshall	ef6fe2b181	Refactoring all interactions with the home/hub table into UIHelper	2014-04-29 15:22:04 +10:00
Will Marshall	26adada506	Reworking UI tests	2014-04-29 15:13:59 +10:00
Will Marshall	9415c4e3ab	Patching our integration tests to use the new home page mechanics	2014-04-29 15:13:58 +10:00