2314 Commits

Author	SHA1	Message	Date
Maikel Linke	52fd7b102e	Unify visiting bulk order management ... DRYing the code allows for easier refactor and more consistency.	2019-03-08 14:46:58 +11:00
Maikel Linke	37d37a6057	Speed up initial spec log in	2019-03-08 14:46:39 +11:00
luisramos0	61f1bf5ec8	Fix shipping_methods edit page missing translation	2019-03-07 17:15:06 +00:00
luisramos0	b325cea6cb	Merge branch 'master' into 2-0-stable-Mar6	2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat	30bbc5ee6f	Merge pull request #3472 from pacodelaluna/fix-datetime-picker ... Fix datetime picker on Order Cycle form	2019-03-05 14:50:34 +01:00
Pau Pérez Fabregat	b330db3b4b	Merge pull request #2947 from Matt-Yorkley/pi/submenu_link ... Pi/submenu link	2019-03-05 14:49:02 +01:00
Luis Ramos	72e9c1d002	Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices ... [Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again	2019-03-04 15:54:09 +00:00
Pau Pérez Fabregat	88e6fa84a2	Merge pull request #3534 from luisramos0/registration_trans_all ... Move registration process translations to lazy lookups to better organize the en.yml file	2019-02-28 17:15:09 +01:00
François Turbelin	82fbcd35a8	Update tests	2019-02-26 22:07:11 +01:00
Matt-Yorkley	9dd5b9dd6c	Fix import button specificity in feature spec	2019-02-26 20:06:02 +00:00
luisramos0	a36722cebf	Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand	2019-02-26 12:47:11 +00:00
luisramos0	15456577a3	Remove the button that enables user to split an order between stock locations ... There's only one stock location in OFN so this feature is not useful at this point	2019-02-25 23:39:21 +00:00
luisramos0	36e2786a1e	Delete Accounts and Billing dead feature code	2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat	df77f6e051	Merge pull request #3536 from Matt-Yorkley/flaky/bom_spec ... Wait for angular to load in BOM spec	2019-02-25 13:14:57 +01:00
Pau Pérez Fabregat	8a855edbda	Merge pull request #3527 from luisramos0/2-0-fix-admin-edit-order-page ... [Spree Upgrade] Fix edit ship method and tracking number in backoffice order page	2019-02-25 12:20:46 +01:00
Matt-Yorkley	6e77afbf35	Adjust expectations in flaky spec	2019-02-25 11:08:10 +00:00
Matt-Yorkley	ea8be0ab95	Fine-tune angular helper	2019-02-23 21:45:33 +00:00
Matt-Yorkley	c4b646c583	Wait for angular to load in BOM spec	2019-02-23 16:12:37 +00:00
luisramos0	ee8fe4b6b4	Move registration process translations to lazy lookups to better organize the en.yml file	2019-02-22 14:37:45 +00:00
luisramos0	b73ca88811	Fix edit ship method and tracking number in backoffice order page ... The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons	2019-02-20 23:57:57 +00:00
luisramos0	5d51ad71b0	Merge branch 'master' into 2-0-stable-Feb20	2019-02-20 14:32:36 +00:00
luisramos0	8ee14ccb4b	Make variants_stock_levels return variants on_demand values	2019-02-19 11:56:02 +00:00
luisramos0	f0842fcbe5	Convert all calls to variant.count_on_hand to variant.on_hand	2019-02-18 21:54:07 +00:00
luisramos0	a0bd290b6a	Fix bulk_order_management spec by setting ship address on the stest order, this makes the order worflow work up to complete because the shipping methods will be validated against the address	2019-02-17 21:53:58 +00:00
Pau Pérez Fabregat	0a391783bc	Merge pull request #3470 from kristinalim/fix/3426-intermittent_spec_failures ... 3426 [Flaky Spec] Address timing issues in enterprise users feature specs	2019-02-15 08:39:39 +01:00
Kristina Lim	af95e3871f	Move check for table presence out of helper	2019-02-15 01:15:58 +08:00
Pau Perez	e5dadd1ab1	Merge branch '2-0-stable' into 2-0-admin-capture-payment ... * 2-0-stable: (121 commits) Stub default value for other calls to File.exist? Add specs for error cases in shipments_controller_spec Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2) Add missing translation to fix shipping methods spec Test tagging polymorphism on a payment method Workaround Rails inheritance bug in Spree::Gateway Improve method names in shipments_controller_spec Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2) Make bulk invoices part of spree upgrade phase 2 Make Api::ShipmentsController#create re-use order.shipment if it exists Improve code and add specs to this controller Decorate spree api shipments controller to scope variants as they are added/removed from shipments Delete all Spree::Admin::LineItemsController customizations as they are no longer used Update spec/controllers/spree/orders_controller_spec.rb Fix broken spec from refactored method Wait for button to disappear before checking flash Use flash matcher in shipping method feature specs Add RSpec matchers for flash messages Do not expect modal open when checking spinner gone Fix layout violation in Spree::Ability decorator Fix description for feature flag example groups ...	2019-02-14 17:41:54 +01:00
Pau Perez	609ff737ca	Fix and simplify feature spec	2019-02-14 17:01:43 +01:00
Maikel Linke	87abfcd704	Simplify shopping spec	2019-02-14 11:42:46 +11:00
luisramos0	728ed2c202	Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2)	2019-02-13 09:06:10 +00:00
Maikel Linke	5f5b0aaabf	Simplify specs with stripe factory	2019-02-13 18:34:22 +11:00
luisramos0	c652cfe4d5	Merge branch 'master' into 2-0-stable-Feb12	2019-02-12 16:03:33 +00:00
Pau Pérez Fabregat	a0c144fd0c	Merge pull request #3415 from openfoodfoundation/feature/enterprise_fee_summary ... [Enterprise Fee Summary] Merge "Enterprise Fee Summary" report to master	2019-02-12 13:58:47 +01:00
Pau Pérez Fabregat	92dca0cdfa	Merge pull request #3194 from HugsDaniel/3109-fix-orders-new ... [Spree Upgrade] Fix admin new order page	2019-02-12 09:58:29 +01:00
Matt-Yorkley	097ffba323	Fix broken spec from refactored method	2019-02-11 23:57:13 +00:00
Luis Ramos	dd44d6a0ca	Merge pull request #3355 from luisramos0/2-0-pord-importer-spec ... [Spree Upgrade] Phase 2 - Fix product_importer spec	2019-02-11 15:28:47 +00:00
Pau Pérez Fabregat	9d065c8a0b	Merge pull request #3233 from Matt-Yorkley/pi/inventories ... Pi/inventories	2019-02-11 16:10:33 +01:00
Pau Pérez Fabregat	da09c8f86c	Merge pull request #3467 from kristinalim/fix/3455-intermittent_spec_failure ... 3455 [Flaky Spec] Do not expect modal still open when checking that the spinner is gone	2019-02-11 15:58:22 +01:00
Kristina Lim	a876c2ab9f	Address timing issues in enterprise roles specs	2019-02-11 13:02:40 +08:00
Kristina Lim	0032a237a2	Wait for button to disappear before checking flash	2019-02-10 22:08:18 +08:00
Kristina Lim	175264f41f	Use flash matcher in shipping method feature specs	2019-02-10 22:08:18 +08:00
Kristina Lim	f143540d0c	Do not expect modal open when checking spinner gone ... The element referenced in the following might no longer be visible: within "div.reveal-modal"	2019-02-09 22:40:40 +08:00
Kristina Lim	461b5725d1	Hide report link and resource from non-superadmins	2019-02-08 21:26:38 +00:00
Kristina Lim	c8b154b12a	Separate enterprise fee summary action ... Split the previous "index" action into "new" and "create" actions.	2019-02-08 21:26:38 +00:00
Kristina Lim	a17fa8013f	Clean up I18n scope in feature specs for report	2019-02-08 21:26:38 +00:00
Kristina Lim	c0e6b70131	Rename EnterpriseFeeSummaryReportController ... Remove "Report" because this is redundant, and pluralize the resource name.	2019-02-08 21:26:38 +00:00
Kristina Lim	2063752b97	Improve specs for Enterprise Fee Summary ... This also addresses a spec that has failed over the rebasing.	2019-02-08 21:26:38 +00:00
Kristina Lim	dcb1d9fe25	Add feature tests for enterprise fee summary	2019-02-08 21:26:37 +00:00
Kristina Lim	edf0b0df76	Add navigation item for enterprise fee summary	2019-02-08 21:26:37 +00:00
Pau Pérez Fabregat	259a5b211b	Merge pull request #3429 from luisramos0/2-0-in-stock ... [Spree Upgrade] 3428 Fix in_stock? and shopping/variant_overrides_spec	2019-02-07 15:25:43 +01:00