luisramos0
89d51d75ae
Merge branch 'master' into 2-0-stable-sept
2018-09-04 17:43:20 +01:00
luisramos0
efcf680094
Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
...
Fixed 5 out of 7 tests in orders_and_fulfillments_report_spec by providing target_shipment in test line_items
Fixed 12 out of 44 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.” “The remaining 32 failing tests are now failing with the very common: undefined method on_hand= on Spree::Variant
Improved 1 test in reports_spec.rb by providing target_shipment in test line_items. Test now fails with undefined method Spree::Order.shipping_method
Fixed 9 tests in orders_controller_spec by providing target_shipment in test line_items
Fixed 4 tests in packing_report_spec.rb by providing target_shipment in test line_items. Failing tests are now failing with undefined product.on_hand? method
Fixed 8 tests in line_items_controller_spec by providing target_shipment in test line_items
Fixed 1 test in update_billable_periods_spec by providing target_shipment in test line_items
Fixed 4 tests in bulk_coop_report_spec by providing target_shipment in test line_items. The 2 failing tests are now failing with undefined product.on_hand? method
Improved 1 test in line_items_controller_spec by providing target_shipment in test line_items. Test is still failing with an unexpected method call
Fixed 1 test in order_and_distributor_report_spec by providing target_shipment in test line_items
2018-08-30 00:33:15 +01:00
Grey Baker
a747561e77
Switch feature matcher style from to_not have to to have_no
2018-08-22 09:29:48 +01:00
Kristina Lim
2bba72c5a9
Fix frontend sorting in "Bulk Order Management"
2018-07-23 10:33:40 +10:00
Rob Harrington
f6af5098b0
Using MomentJS to handle dates on bulk order management
2018-02-09 14:43:48 +11:00
Enrico Stano
01b0a033fd
Merge pull request #1904 from oeoeaio/spree-test-config
...
Use Spree's approach for preventing config caching when testing
2017-12-04 15:57:11 +11:00
Andy Palmer
7b8463b03a
PhantomJS no longer crashes due to too specific selector
2017-11-10 08:47:12 +11:00
Matt-Yorkley
01647c3df9
Disable allow_backorders by default in test environment
2017-11-02 17:43:46 +11:00
Lynne Davis
cad3464f56
Adjusted BOM spec to reflect currency symbol changes
2016-12-09 11:40:55 +00:00
Rob Harrington
245db8971a
Fixing specs broken by faster PhantomJS
2016-05-25 08:10:20 +10:00
Rob Harrington
10133a13f2
Make sure that changes are saved before attempting to click link
2016-05-25 08:10:20 +10:00
Maikel Linke
2a3b3b6dd2
Merge remote-tracking branch 'origin/master' into i18n-hackathon
...
Conflicts:
app/assets/javascripts/admin/enterprise_fees.js
app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
app/views/admin/shared/_columns_dropdown.html.haml
app/views/admin/variant_overrides/_header.html.haml
app/views/admin/variant_overrides/_products.html.haml
spec/features/admin/bulk_order_management_spec.rb
spec/features/admin/variant_overrides_spec.rb
2016-03-11 15:38:28 +11:00
Maikel Linke
b7320a0bd7
Translate "Price" in Bulk Order Management
2016-03-11 12:48:35 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rohan Mitchell
977ff7b35d
Fix compatibility issues with new version of select2
2016-02-24 11:26:37 +11:00
Rob Harrington
9eaec6061e
Pulling columns dropdown out into a shared partial
2016-01-13 18:49:32 +11:00
Rob Harrington
54e7677888
Integrating StatusMessages into save-bar, adding to variant overrides index
2016-01-13 18:49:32 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rob Harrington
7e6b43266f
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
2015-11-25 14:23:55 +11:00
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
c199e22190
Make a few BOM specs more robust
2015-11-16 10:31:41 +11:00
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
