raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,359 Commits 18 Branches 451 Tags
66fcbe3fa0dcffe00e44f2c006f2188c19353a58
Commit Graph

1047 Commits

Author SHA1 Message Date
Rachel Arnould
96d2021b72 Merge branch 'master' into buu/add-product-images-11065 2024-01-25 16:32:45 +01:00
David Cook
c3914bc7ae Merge pull request #11759 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.3.1 
chore(deps): bump tom-select from 2.2.3 to 2.3.1
 2024-01-25 16:26:10 +11:00
David Cook
f72154e40c Add image create form 
Re-using the edit image form, because they're basically the same.
 2024-01-25 14:14:58 +11:00
David Cook
07bef860b2 Add spec for updating image 2024-01-25 14:14:58 +11:00
David Cook
25f4954795 Combine spec 2024-01-25 14:14:58 +11:00
David Cook
e92f4a120a Refactor: re-organise spec file 
No code changes, just moving it around and renaming blocks. Best viewed with white-space ignored.
 2024-01-25 14:14:58 +11:00
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category 
Spec requiring tax category when creating products
 2024-01-24 16:26:57 +01:00
Gaetan Craig-Riou
67dc79b074 Replace tomselect_search_and_select by tomselect_select 
In these scenarios, searching for the option is not actually required,
we can directly click on the needed option. It prevent issue with
the dropdown option staying open and breaking specs.
 2024-01-24 14:53:44 +11:00
Gaetan Craig-Riou
270a310e0f Use send_keys to populate tom select input 
Setting the value directly doesn't trigger the search, presumably
because it doesn't trigger any javascript event.
 2024-01-23 11:52:01 +11:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
David Cook
137489f492 Refactor: move basic modal styles to generic parent component 
The style was already being shared with a sibling component.

Now we can instantiate a plain old 'modal'.
 2024-01-16 12:53:07 +11:00
Maikel
3431f89ec3 Merge pull request #11470 from openfoodfoundation/dependabot/bundler/webmock-3.19.1 
chore(deps-dev): bump webmock from 3.18.1 to 3.19.1
 2024-01-15 10:57:08 +11:00
binarygit
e865f27158 Provide correct modal-link-target-value and write tests for orders#edit page 2024-01-14 15:33:31 +05:45
binarygit
75ca1dddf1 Fix tests and rubocop warnings 2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2 Send shipment email by default 2024-01-14 15:06:02 +05:45
binarygit
95a51159d7 send-shipment-email-optionally 2024-01-14 15:05:59 +05:45
Maikel Linke
c5b64e875f Remove unnecessary spec helper 
Best viewed ignoring whitespaces.

Products don't require a tax category by default. And when you activate
it via Spree::Config then it's automatically reset at the end of the spec.
We don't need this helper to do it.
 2024-01-12 17:12:40 +11:00
Maikel
d197251262 Merge pull request #12026 from dacook/rubocop-autocorrect 
Autocorrect Rubocop issues
 2024-01-11 09:04:49 +11:00
Gaetan Craig-Riou
557e6e6a37 Return a duplicate empty string for css pack request 2024-01-10 16:46:13 +11:00
David Cook
c95d7523f6 Merge pull request #12013 from mkllnk/spec-file-helper 
DRY specs with fixture_file_upload helper
 2024-01-10 10:28:23 +11:00
David Cook
47418d9873 Merge pull request #12014 from mkllnk/voucher-on 
Remove feature toggle for vouchers, they are always on
 2024-01-10 09:58:35 +11:00
David Cook
18c2b2512b Safely autocorrect Style/RedundantLineContinuation 
Inspecting 1530 files
.................................................................................................................................................................................C................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C.......................................................................................................................

Offenses:

app/helpers/shop_helper.rb:48:43: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
    no_open_order_cycles?(order_cycles) &&
                                          ^
app/helpers/shop_helper.rb:48:44: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
    no_open_order_cycles?(order_cycles) && \ ...
                                           ^
spec/system/admin/configuration/content_spec.rb:35:64: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
    expect(page).to have_selector :link, "markdown link", href:
                                                               ^
spec/system/admin/configuration/content_spec.rb:35:65: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
    expect(page).to have_selector :link, "markdown link", href: \ ...
                                                                ^

1530 files inspected, 4 offenses detected, 4 offenses corrected
 2024-01-10 09:29:37 +11:00
Konrad
591885610a Merge branch 'master' into task/11923-add-vouchers-to-oc-customer-total-report 2024-01-09 18:51:47 +01:00
Rachel Arnould
f7aca7a9f1 Merge branch 'master' into 11431-show_warning_when_a_new_invoice_can_be_generated 2024-01-08 16:38:39 +01:00
Rachel Arnould
bd0a296100 Merge pull request #11846 from chahmedejaz/task/11068-delete-product-or-variant 
[BUU] Add option to delete a product or variant
 2024-01-08 13:17:29 +01:00
Jean-Baptiste Bellet
f500d1e7a8 Instead of stubbing CSS pack requests, ignore them with VCR 2024-01-08 16:54:53 +11:00
Maikel Linke
4e510e9bd0 Avoid warning hiding main menu in report spec 2024-01-08 15:54:25 +11:00
Maikel Linke
a8c83b670b Remove superfluous feature tag from specs 2024-01-08 15:53:50 +11:00
Maikel Linke
e2eead0f86 Scroll to reveal White Label tab 
The Vouchers tab pushed the White Label tab further down and it was
hidden by the savebar. The CSS adjustment in this commit makes sure
that users can always see all menu items.

The automatic scrolling by Capybara fails because of the savebar but
scrolling to the bottom works.
 2024-01-08 15:52:17 +11:00
Maikel Linke
2699ae6ca7 DRY terms of service PDF file use in specs 2024-01-08 13:01:21 +11:00
Maikel Linke
dd639435f1 Remove unnecessary image file helper 2024-01-08 13:01:21 +11:00
Maikel Linke
6327f46733 Use fixture_file_upload helper where possible 
We can't use it in factories but in other places it's a nice shortcut.
 2024-01-08 11:32:01 +11:00
Maikel Linke
57a6d1ef06 Partial spec of error message for readability 
This avoids Rubocop warnings. We don't need to test for the whole
message. The tested part is unique already and quicker to read.
 2024-01-05 11:48:30 +11:00
Maikel Linke
883bfcdf0d Simplify column toggling in report spec 
* This partly reverts 3a957fb988.
 2024-01-04 16:53:36 +11:00
Ahmed Ejaz
3a957fb988 11923: add specs 2024-01-03 15:46:16 +05:00
Maikel
1746ba5878 Merge pull request #11972 from filipefurtad0/fix_flaky_enterprise_navigation 
Moves test introduced by #11799 to avoid non-explicit modal acceptance
 2024-01-03 11:19:33 +11:00
Maikel
63ce91d52a Merge pull request #11954 from mkllnk/delete-app 
Enterprise user can remove Connected Apps
 2024-01-03 11:17:26 +11:00
Ahmed Ejaz
1d6a089754 11068: fix specs 2023-12-28 22:11:52 +05:00
Ahmed Ejaz
f194b03882 11068: add sleep of 0.1s 2023-12-28 17:51:52 +05:00
David Cook
263f68f927 Merge pull request #11915 from murjax/cleanse-stripe-js-errors-11886 
Cleanse JS errors from DOM on Stripe failure
 2023-12-28 13:11:36 +11:00
Ahmed Ejaz
c5a86341dc 11068: update sleep logic in specs 2023-12-24 02:00:26 +05:00
Ahmed Ejaz
87d328d6d6 11068: fix specs 2023-12-23 16:08:26 +05:00
Konrad
398be49d43 Merge pull request #11914 from bmd08a1/ft/include-vouchers-in-revenues-by-hub-report 
Include voucher tax adjustment in revenues by hub report
 2023-12-22 20:59:00 +01:00
filipefurtad0
2e301a67b0 Moves test introduced by #11799 to a section in the spec where a modal does not need acceptance 
Tests forward navigation
 2023-12-22 14:24:37 +00:00
Gaetan Craig-Riou
d0edf57e74 Fix tos system spec 
Actually create a ToS file instead of using a fake one
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
b28f40b125 Add system spec for ToS Banner 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
91862c126b Remove now useless fix 
Now that the banner isn't displayed if enterprise are not required to
sign ToS, the fix is useless
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
6226067846 Update translation to be inline with design mockup 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
8e3e9ad18a Fix terms and condition spec 
Timecop intefere with the fake terms of service, so we need to manually
accept the terms of service to make the banner disappear
 2023-12-22 13:20:14 +01:00
Ahmed Ejaz
78f5a8ad30 11068: add specs 
- For system's product delete action
 2023-12-20 12:54:54 +05:00