raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-05 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,361 Commits 19 Branches 461 Tags
3b2bdb8397bb71c3fdbe09bd3cff3f4d2cfccf4d
Commit Graph

84 Commits

Author SHA1 Message Date
Rob Harrington
ae7fb91a9a Only reloading line_items and orders on BOM, $timeout for adding blankOption 
$timeout required for adding a blank option to lists of suppliers,
distributors and orderCycles to prevent spec failures related to the
use of select2
 2015-11-13 15:59:33 +11:00
Rob Harrington
4191e2b6f0 Changing the way select filters are reset on BOM to try and fix specs 2015-11-13 09:44:57 +11:00
Rob Harrington
88fd9f72e6 Retry uncooperative BOM feature spec 2015-11-13 09:14:20 +11:00
Rob Harrington
6966fbba7c Present date limits being set in line items controller .js unless orderCycleFilter has actually been set 2015-11-12 17:40:35 +11:00
Rob Harrington
be8038e9d0 Merge branch 'master' into line_item_naming 
Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb
 2015-11-12 14:40:11 +11:00
Rob Harrington
2719c699d7 Updating line items index spec 2015-11-12 10:06:41 +11:00
Rohan Mitchell
6476ce6ba9 Make spec more resilient 2015-11-10 15:05:45 +11:00
Rob Harrington
ab7bfd10c5 Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" 
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.

Conflicts:
	lib/open_food_network/order_and_distributor_report.rb
	spec/features/admin/variants_spec.rb
	spec/lib/open_food_network/order_and_distributor_report_spec.rb
 2015-10-28 13:08:50 +11:00
Rob Harrington
795830d94d Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module 2015-10-28 13:07:31 +11:00
Maikel Linke
0fd29dd32e use expect in bulk_order_management_spec 2015-10-22 13:43:15 +11:00
Maikel Linke
2488411b94 JS feature specs completing before cleaning db 
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
 2015-09-16 15:38:09 +10:00
Maikel Linke
3f822ed0e3 trying to get rid of intermittent failures 2015-09-16 13:06:32 +10:00
Maikel Linke
33af6cbfb1 Specs pending for lagging JS spec test 2015-09-16 11:24:44 +10:00
Lynne Davis
8639109372 Variable weights improvements additions 2015-08-04 20:13:28 +01:00
Rob Harrington
903ed7e507 Merge branch 'master' into variable_weights 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb
 2015-05-21 17:31:33 +10:00
Rob Harrington
79a59e2e81 Add order_with_distributor factory 2015-05-21 13:34:32 +10:00
Lynne Davis
2f463474fb Adding specs for variable weight adjustment via builk order management 2015-05-09 19:10:55 +01:00
Rob Harrington
68b4cb59be Fixing bulk management specs broken by making order_cycles filter update dates 2015-05-07 12:50:57 +10:00
Rob Harrington
66669e66ab Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts 2014-12-12 15:43:05 +11:00
Rob Harrington
45bcee16ef Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails 2014-11-27 09:44:13 +11:00
Rob Harrington
c6d463bf25 Revert "Pending bulk order mgmt specs" 
This reverts commit eead8d665f.
 2014-09-20 18:06:42 +10:00
Rob Harrington
eead8d665f Pending bulk order mgmt specs 2014-09-17 11:39:20 +10:00
Rob H
ee4a1925fe Bulk Order Management works with navigation helper override 2014-09-06 00:34:27 +10:00
Rob H
d8c1823328 Fix broken specs 2014-08-08 14:05:54 +10:00
Will Marshall
b757629bfa Minor test tweaks 2014-05-29 11:52:46 +10:00
Will Marshall
f25617dde7 Tweaks for laura, reworking authentication workflow, tidying up checkout 2014-05-09 16:42:51 +10:00
Rohan Mitchell
87b605b604 Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper 2014-05-09 08:55:44 +10:00
Rob H
dcf048d631 Merge branch 'temp' into ng-cleanup 2014-05-07 13:08:13 +10:00
Rob H
fe5d015778 Merging in master 2014-05-07 13:07:11 +10:00
Rob H
2e7cf612d6 Fix broken BOM spec 2014-05-07 12:30:06 +10:00
Will Marshall
bbb70342b3 Merging 2014-05-02 15:35:43 +10:00
Rob H
ceada3596b Merge master into cleanup 2014-05-02 14:43:06 +10:00
Rohan Mitchell
930bc2b7ce Set increased Capybara.default_wait_time globally 2014-05-02 14:25:32 +10:00
Will Marshall
705e247eb8 Tweaking the bulk order management spec again 2014-05-02 12:41:04 +10:00
Will Marshall
8c319334db Cleaning out the spree auth stuff 2014-05-02 12:34:19 +10:00
Rob H
b59aa53158 Add edit order button to BOM 2014-04-24 13:49:28 +10:00
Rob H
76f05d13d7 Slow specs on CI 2014-04-24 10:50:35 +10:00
Rob H
669ec0eee7 Fix failing API specs 2014-04-23 12:02:27 +10:00
Rob H
5c7d36ba9b BOM: interface cleanup and adding 'Clear All' button for filters 2014-04-10 15:29:09 +10:00
Rob H
645b6d5a8f BOM: change datetimepickers to datepickers 2014-04-10 10:51:55 +10:00
Rob H
c5d5f5a9e6 BOM: view information about max quantities ordered 2014-04-10 10:33:57 +10:00
Rob H
aad5ad4bc0 BOM interface cleanup 2014-04-06 19:22:17 +10:00
Rob H
0a6230088d Make BOM bulk action dropdown pretty 2014-04-06 17:39:53 +10:00
Rob H
366555d9a7 Remove old column toggle from BOM 2014-04-05 10:08:37 +11:00
Rob H
8e54bf1e2e Enterprise users are aurthorised to view BOM 2014-04-04 09:11:56 +11:00
Rob H
771ccc6e76 Merge branch 'capybara-fails' into bom 2014-03-28 13:52:17 +11:00
Rob H
73271fa45a Fix BOM regression bugs caused by capybara upgrade 2014-03-28 13:50:10 +11:00
Rob H
cd1086ce05 WIP: Bulk calculation box work with shared resources 2014-03-26 16:44:26 +11:00
Rob H
cbd3722380 Merge branch 'master' into bom 2014-03-21 13:47:50 +11:00
Rob H
f2729f9e80 Add more columns to BOM 2014-03-21 13:46:48 +11:00