raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,075 Commits 17 Branches 453 Tags
11304ef6fdd56df9515e09c536ef51c5878dd67d
Commit Graph

4625 Commits

Author SHA1 Message Date
Luis Ramos
11304ef6fd Merge pull request #3371 from luisramos0/2-0-xero-invoices 
[Spree Upgrade] Fix xero invoices report specs
 2019-02-06 16:48:49 +00:00
Pau Pérez Fabregat
faea876ff0 Merge pull request #3361 from luisramos0/2-0-report-spec 
[Spree Upgrade] Phase 2 - Fix some specs in reports_spec and in lettuce share report
 2019-02-01 08:26:55 +01:00
luisramos0
f6e6f67e7d Switch Spree::Config test setup with a mock in reports_spec to keep global test setup untouched 2019-01-30 15:03:23 +00:00
Maikel
155b205ac2 Merge pull request #3401 from luisramos0/2-0-stable-jan-29th 
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
 2019-01-30 14:44:40 +11:00
luisramos0
729feb16f1 Merge branch 'master' into 2-0-stable-jan-29th 2019-01-29 12:38:34 +00:00
Pau Perez
f4b790eefa Restore adjustments state after updating 
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
 2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd Trigger the appropriate callbacks from controller 2019-01-29 09:40:54 +01:00
Pau Perez
0b62b4621f Make expectation easier to reason about 2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7 Make controller req. params a bit more obvious 2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d Restore distributor in test that relies on it 2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a Do not modify config's state in test 2019-01-29 09:40:53 +01:00
Maikel
937aaf67c3 Merge pull request #3250 from coopdevs/open-adjustments-for-update 
[Spree Upgrade] Open adjustments to enable update
 2019-01-24 10:25:16 +11:00
Kristina Lim
cf7f8b887f Add tests for permissions for variant overrides 2019-01-24 07:08:54 +11:00
luisramos0
908c32587b Fix xero invoices specs in reports_spec by removing the shipping adjustment as this is put in the order by the standard order callbacks when line items are added 2019-01-23 15:07:31 +00:00
Maikel
2064ffe548 Merge pull request #3354 from luisramos0/knapsack 
New Knapsack report
 2019-01-22 10:58:13 +11:00
Pau Pérez Fabregat
2b95b5e797 Merge pull request #3347 from luisramos0/2-0-default-on-demand 
[Spree Upgrade] Sets StockLocation.backorderable_default to false in test factories
 2019-01-21 17:34:46 +01:00
luisramos0
0f26080d79 In lettuce share report spec, call method directly instead of using send 2019-01-21 15:00:37 +00:00
Pau Pérez Fabregat
d8710d283a Merge pull request #3320 from luisramos0/2-0-subs-mailer 
[Spree Upgrade] Phase 2 - Subscriptions - Specify :mailer type in SubscriptionMailer spec
 2019-01-21 15:09:56 +01:00
Pau Pérez Fabregat
807c45a25c Merge pull request #3349 from coopdevs/fix-shipment-without-fee 
Fix shipment without fee
 2019-01-21 14:51:10 +01:00
luisramos0
9b2fb56025 Fix reports_spec sales tax report test by calling count_on_hand setter, setting shipping_method in the right step in the checkout workflow and changing login method to match all other tests in this spec 2019-01-20 20:40:14 +00:00
luisramos0
4669c71b19 Fix lettuce_share_report_spec by adapting count_on_hand setter, it's not a db column anymore 2019-01-20 20:40:14 +00:00
luisramos0
5d86d3769e Improve variable names in lettuce_share_report_spec 2019-01-20 20:40:14 +00:00
luisramos0
d155bb142c Make proxy order spec a bit more resilient by allowing two secs diff in timestamps 2019-01-19 15:53:05 +00:00
Matt-Yorkley
3929689d48 Ensure login via modal is completed 2019-01-18 19:06:42 +00:00
Pau Pérez Fabregat
a95dd98ed6 Merge pull request #2869 from Matt-Yorkley/bi/bulk_invoices 
[Bulk Invoice Printing] Bulk invoices
 2019-01-18 17:49:34 +01:00
Pau Perez
a99a4725c9 Add #shipment to conform to OFN's decision 
This ensures we can still use Order#shipment although Spree deprecates
it, while fixing a bug at the same time. The problem that was making the
test fail was on `Order#shipment` that Spree defines.

If the shipments association changes, `#shipment` returns stale data.
That is because the order object we might be using is still alive, and
so its @shipment ivar still holds an old shipment object (it's not nil)
and thus `@shipment ||= shipments.last` doesn't evaluate the right-hand
side of the expression.

Note that we need to `prepend` the evaluation of the concern (which it's
been rename) for our methods to take precedence over Spree ones. With
`include`, Spree's `#shipment` would still be picked up making the test
fail.
 2019-01-18 16:02:51 +01:00
luisramos0
01f0671f6d Add missing accept alert in products_spec when deleting product properties 2019-01-18 12:45:29 +00:00
luisramos0
6da94fc960 Adapt cart_controller_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:29 +00:00
luisramos0
eac365182f Adapt variants_stock_levels_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:25 +00:00
luisramos0
0460e7fc6c Merge branch 'master' into 2-0-stable-jan-17th 2019-01-17 22:51:25 +00:00
luisramos0
f896e78e6f Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory. 
This makes the default value of variant.on_demand false in all environments and in tests.

Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
 2019-01-17 20:28:05 +00:00
luisramos0
1d60732581 Improve readability of payment_method_spec 2019-01-17 20:18:43 +00:00
luisramos0
b52c99ac26 Delete on_hand test in product spec, this is already covered in product_stock_spec 2019-01-17 20:18:43 +00:00
Pau Pérez Fabregat
c178478a4f Merge pull request #3346 from luisramos0/headless-chrome 
Merge Headless Chrome to master
 2019-01-17 20:04:27 +01:00
Pau Pérez Fabregat
e8dd6e9ce7 Merge pull request #3322 from luisramos0/delete_archive_spec 
Delete dead code and unused folders
 2019-01-17 20:01:49 +01:00
Maikel
9322c3f0c8 Merge pull request #3343 from Matt-Yorkley/headless5 
[Headless Chrome] Fix datepicker interactions in bulk_order_management_spec
 2019-01-17 14:19:00 +11:00
Matt-Yorkley
b3849778fa Fix datepicker interactions in bulk_order_management_spec 2019-01-16 21:51:15 +00:00
Matt-Yorkley
07dff0af7f Check tag js has finished executing before submitting form 2019-01-16 17:46:56 +00:00
Matt-Yorkley
7487a6da3c Fix shipping method tests 2019-01-16 17:17:10 +00:00
Matt-Yorkley
21bdaf9960 Fix enterprise images spec 2019-01-16 16:24:01 +00:00
Matt-Yorkley
40ccabc2b4 Fix broken product import spec 2019-01-16 16:24:01 +00:00
Maikel Linke
f391eab5b0 Revert "Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes" 
This reverts commit 7dc208fb8c.
 2019-01-16 16:24:01 +00:00
Maikel Linke
6a53e5fd3d Avoid alert by waiting until shop loaded 2019-01-16 16:24:01 +00:00
Maikel Linke
dd5bd5b616 Remove js_errors = false from specs because it is not available in Selenium ChromeDriver 
If the js errors this line was hidding become a problem we will need to address them
 2019-01-16 16:24:01 +00:00
luisramos0
fce56776f6 Make embedded_shopfronts_spec work with selenium 2019-01-16 16:24:01 +00:00
luisramos0
5fb4faac91 Make features/admin/subscriptions_spec and shopworkflow work with selenium 
Also, remove a test support method, dead code
 2019-01-16 16:24:01 +00:00
Maikel Linke
e49eb42af6 Make Chrome accepting alerts 2019-01-16 16:21:30 +00:00
Maikel Linke
843ec2c08f Wait for table rows before testing them 
Unfortunately, the exact table row matcher doesn't wait correctly for
changes on the page. Waiting correctly would mean to assemble a very
complicated xpath similar to this gem:

https://github.com/jnicklas/capybara_table
 2019-01-16 16:21:30 +00:00
Maikel Linke
1407ae7778 Make TableMatcher match exactly, not part of row 
Reverts dbf3a7aaaf9d458f99e14983ca9db2d4cbe4b564.

The reverted commit tried to avoid a 30 second delay by using
have_selector. While that was successful in reducing test time, it made
the matcher find rows that where not exactly the wanted row, but contained
text of the wanted row. This wasn't a problem until we experimented with
Chrome as test browser returns text on select boxes.

This commit makes the matcher precise again. We still have to deal with
the 30 second delay.
 2019-01-16 16:21:30 +00:00
Rob Harrington
ef68bd1b43 Replace unnecessary perform_and_ensure* type helpers with standard actions and expectations 2019-01-16 16:21:30 +00:00