raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,476 Commits 19 Branches 454 Tags
b49de7d49eafbd8988f910abc288cf909d5d73d0
Commit Graph

28476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
b49de7d49e Simplify spec 
What if Zucchini didn't appear at all? Better to test that the two products appear on the same page, in the correct order.
 2023-08-16 11:13:54 +10:00
David Cook
1155bd42ea Reflex test to reveal collation sorting varies on different OS... 
https://dba.stackexchange.com/questions/106964/why-is-my-postgresql-order-by-case-insensitive

Uncommented, the spec fails on macOS (BSD).. but succeeds in Ubuntu (Linux). Weird.
 2023-08-15 08:36:22 +02:00
David Cook
0f086df12b Setup StimulusReflex testing [add gem] 
Surprisingly, the StimulusReflex framework [doesn't have many resources for testing](https://docs.stimulusreflex.com/appendices/testing.html), but thankfully someone's made a gem.
 2023-08-15 08:36:22 +02:00
David Cook
e816228959 Sort products by name in ascending order 
The order is specified above in fetch_products. I'm guessing this line was unintentional?

Original requirment doesn't say ascending but I think it's safe to assume (issue#10694).
 2023-08-15 08:36:22 +02:00
David Cook
6dbfb36e52 Spec: use url helpers 
To be consistent with other specs.
 2023-08-15 08:36:22 +02:00
David Cook
9a3820db4f Tidy up spec 
Although 'describe' and 'context' are the same simple constructs to label groups of examples, to humans they mean:
 * Describe a particular domain of functionality
 * Context means a different environment, IE something has been set up differently (generally with before and/or let blocks)

Also the default 'before' is :each, so we don't need to specify it.
 2023-08-15 08:36:22 +02:00
David Cook
757ba27908 Optimise spec: only create objects when needed 
Moving the 'clear filters' and 'no results' tests up into the first context.
 2023-08-15 08:36:22 +02:00
David Cook
2a4d5af552 Remove redundant test 
This is already covered in the following test.
 2023-08-15 08:36:21 +02:00
David Cook
8949f1dc2e Convert route to resource 
I don't know why the route helper now has "index" in the name.
 2023-08-15 08:36:21 +02:00
jibees
364ae5c0c6 Merge pull request #11404 from rioug/11402-invoice-data-generator-fix-flacky-test 
Invoice data generator, fix flaky test
 2023-08-15 08:34:53 +02:00
Gaetan Craig-Riou
5a2155aeb7 Use the same sorting when choosing a line item to update 
The presenter uses order.sorted_line_items, so use the same method
when picking up the line item to update.
 2023-08-15 11:33:02 +10:00
David Cook
2196cd5be8 Merge pull request #11381 from openfoodfoundation/release_v4.4.7 
Update translations for release v4.4.7
 2023-08-15 10:21:34 +10:00
David Cook
8b666c67d6 Fix typo 
🤦 Always, always preview changes before committing.
 2023-08-15 09:54:42 +10:00
David Cook
54328d7b98 Mention browser limitations 2023-08-15 09:53:39 +10:00
Konrad
99daab07b7 Merge pull request #11297 from mkllnk/require-belongs-to--part2 
Require belongs_to associations by default
 2023-08-12 17:09:03 +02:00
Matt-Yorkley
613802f477 Update stage.yml 2023-08-11 13:50:34 +01:00
Matt-Yorkley
99907dc3a6 Update stage.yml 2023-08-11 13:48:31 +01:00
Matt-Yorkley
7084d0cb40 Update stage.yml 2023-08-11 13:44:38 +01:00
Matt-Yorkley
e33b0af6fe Update stage.yml 2023-08-11 13:42:14 +01:00
Matt-Yorkley
6dfeecead1 Update stage.yml 2023-08-11 13:30:35 +01:00
Rachel Arnould
5afe45d922 Merge pull request #11382 from jibees/11273-buu-remove-new_products_page-feature-toggle 
🔧 Remove `new_products_page` and all associated controllers/components/...
 2023-08-11 11:43:49 +02:00
David Cook
5a96f285c1 Update release title 2023-08-11 16:24:11 +10:00
David Cook
1a58914e43 Categories release notes by dependencies label 
https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
 2023-08-11 16:13:22 +10:00
Gaetan Craig-Riou
61e6d55872 Merge pull request #10821 from rioug/10727-vouchers-percentage-rate 
[Vouchers] Percentage rate
 2023-08-11 16:06:09 +10:00
Gaetan Craig-Riou
a2def2424c Add a comment around the use of safe_constantize 
It triggers a Brakeman error that can be safely ignored
 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
9c9a6234e1 Per review, clean up voucher specs 
Add explicit 'order.item_total' to make specs more readable
 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
054eac0822 Use a better describe 
Co-authored-by: David Cook <david@redcliffs.net>
 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
e6b53c0a42 Per review , Simplify creation of Voucher 
We now check against known type to instanciate the correct voucher
instead of using a case
 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
3f63cfbc27 Fix Rubocop warning 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
e8b374d0f2 Remove left over comment 2023-08-11 15:41:45 +10:00
Gaetan Craig-Riou
2828bd098d Refactor VoucherAdjustment service 
We are taking advantage of having a FlatRate and a PercentageRate
model to simplify the code a little
 2023-08-11 15:41:34 +10:00
Gaetan Craig-Riou
29a38467d2 Fix admin pages to work with refactored vouchers 2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
46e04ca7ee Refactor voucher: 3 percentage rate voucher 2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
def594ab81 Refactor voucher: 2 FlatRate voucher 2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
204f3933d0 Refactor voucher: 1 base voucher class 
Refactor voucher to use a single table inheritance. It will simplify the
code and remove a bunch of conditional
 2023-08-11 14:54:23 +10:00
Gaetan Craig-Riou
959e2308dd Add system specs for percentage based voucher 
Similar to tax included in price scenario, adds a test for percentage
based voucher to check the adjustments are recalculated when needed.
Plus fix tax incluced in price specs to use new factory
 2023-08-11 14:51:36 +10:00
Gaetan Craig-Riou
70bd714369 Finish calculation for percentage voucher 
Add calculation when tax is not included in price
 2023-08-11 14:51:36 +10:00
Gaetan Craig-Riou
cdb33aa0d0 Add calculation for percentage voucher 
It include calculation for order with taxes included in the price
 2023-08-11 14:30:48 +10:00
David Cook
e536393f02 Merge pull request #11389 from mkllnk/session_store 
Remove ignored session store config
 2023-08-11 14:27:44 +10:00
Gaetan Craig-Riou
cc9069e9c6 Add voucher type to admin screen 
Plus specs
 2023-08-11 14:19:26 +10:00
Gaetan Craig-Riou
619285ad4a Add voucher_type to voucher 
And update related specs
voucher_type doesn't do anything for now.
 2023-08-11 14:19:25 +10:00
Gaetan Craig-Riou
1be8daaf86 Add specs to cover re calculation 
It is important that the calculated voucher adjustments don't change
if they are recalculated and it is equally important that they are
updated if the order has changed
 2023-08-11 14:19:25 +10:00
Maikel
fc8e39987a Merge pull request #11385 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.132.1 
chore(deps): bump aws-sdk-s3 from 1.132.0 to 1.132.1
 2023-08-11 11:39:14 +10:00
Maikel Linke
7fe74e811e Remove ignored session store config 
We set the session store in an initializer and therefore the development
config was overridden without having any effect.
 2023-08-11 10:27:37 +10:00
Maikel Linke
a34a351cee Stabilise flaky spec with deterministic row order 2023-08-11 10:14:47 +10:00
Maikel
146b09dc57 Spec EnterpriseFee tax_category association 
Co-authored-by: David Cook <david@redcliffs.net>
 2023-08-11 10:14:47 +10:00
Maikel Linke
efbf1d6b8f Stabilise flaky assertion on PDF text 
The PDF reader can't always place text elements in the right place. So
something that should be in one line can be in multiple lines and those
lines can be in a different order. I'm asserting the moving parts
separately as done in other places of this spec.
 2023-08-11 10:14:47 +10:00
Maikel Linke
1b6eeb0928 Reduce line length of PaymentMethod class 
Rubocop was complaining. So I found code that could be simplified and
specced it before refactoring.
 2023-08-11 10:14:47 +10:00
Maikel Linke
faeb8ae8f8 Fix Exchange clone tagging 
The validation of ActsAsTaggableOn::Taggable failed when trying to copy
tag ids during cloning. But I found that it's totally unnecessary
because `Exchange.dup` copies the `tag_list` attribute already and it
gets saved correctly. There's an existing spec for this.
 2023-08-11 10:14:47 +10:00
Maikel Linke
4a13576f78 Remove now superfluous belongs_to default declaration 2023-08-11 10:14:47 +10:00