raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

12632 Commits

Author SHA1 Message Date
Filipe
c9084db933 Merge pull request #11761 from binarygit/open-external-links-in-new-page 
Open external links in product description in a new page
 2023-11-17 10:30:03 +00:00
Maikel
a1dbb3353f Merge pull request #11820 from macanudo527/fix_autocorrect_rubocop2 
Fix Style Rubocop Errors
 2023-11-17 14:25:12 +11:00
Maikel Linke
6f3bee708c Check feature name in specs 
There was one case where a typo meant that the desired feature wasn't
active and tests were not testing the right code path. Using this new
syntax should prevent that.

* https://github.com/openfoodfoundation/openfoodnetwork/pull/11705
 2023-11-17 13:18:31 +11:00
Maikel Linke
d841b1dae2 DRY feature activation in specs 
It's simple this way and we have one place to add logic to when needed
(see next commit).
 2023-11-17 13:17:27 +11:00
Maikel
f087aa07d0 Merge pull request #11705 from abdellani/fix-existing-tests 
Fix invoice printing tests
 2023-11-17 12:57:24 +11:00
Neal Chambers
c3c4486d0c Safely autocorrect Style/RedundantStringEscape 
Inspecting 1513 files
..........................................................................................................................................................................................................................................................................................................................C...........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................C...........................................................................................................

Offenses:

app/models/spree/calculator.rb:31:48: C: [Corrected] Style/RedundantStringEscape: Redundant escape of / inside string literal.
      self.class.name.titleize.gsub("Calculator\/", "")
                                               ^^
spec/controllers/spree/admin/shipping_methods_controller_spec.rb:40:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        params[:shipping_method][:calculator_attributes][shipping_amount] = "\'20.0'"
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:82:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
    fill_in("#{prefix}_calculator_attributes_preferred_flat_percent", with: "\'20.0'")
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:140:42: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        'preferred_flat_percent', with: "\'20.0'"
                                         ^^

1513 files inspected, 4 offenses detected, 4 offenses corrected
 2023-11-17 09:03:32 +09:00
David Cook
668b102efc Combine two specs for efficiency 2023-11-17 10:21:55 +11:00
Ahmed Ejaz
b056c1495b Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-17 03:53:33 +05:00
Maikel
54f6b32231 Merge pull request #11810 from filipefurtad0/extend_payment_intents_tests 
[VCR, automation] Adds payment intent tests with invalid cards
 2023-11-17 09:50:25 +11:00
Ahmed Ejaz
29eadedc3a Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-17 03:45:54 +05:00
David Cook
2960f7570e Merge pull request #11741 from abdellani/fix-product-with-ml-unit-display-dl 
Fix product with ml unit display dl
 2023-11-17 09:41:44 +11:00
Ahmed Ejaz
fc59c9397d 11606, fix lint issues 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
4040dc0a52 #11606, add and fix specs for pretty_time method 2023-11-16 20:57:40 +01:00
Filipe
ed8fd41bec Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop 
Fix Orders in confirmation state cannot be completed by hub or shop
 2023-11-16 19:50:14 +00:00
Filipe
37436aab80 Merge pull request #11799 from murjax/enterprise-panel-navigation-6754 
Fix navigation behavior on enterprise settings panel tabs
 2023-11-16 17:56:49 +00:00
Konrad
dff8257255 Merge pull request #11661 from mkllnk/report-file-storage 
Store report files on the local disk
 2023-11-16 16:20:46 +01:00
filipefurtad0
beb47f03c0 Removes Stripe module 
...and calls it within the describe block
 2023-11-16 14:46:25 +00:00
Maikel
63721938c3 Merge pull request #11780 from filipefurtad0/fix_pending_examples_on_invoices_spec 
Fixes pending tests cases on invoices spec
 2023-11-16 17:00:02 +11:00
filipefurtad0
9d00b7dc43 Re-records relevant cassettes 2023-11-15 13:05:15 +00:00
filipefurtad0
4c3f87f047 Adds payment intent tests with invalid cards 2023-11-15 13:05:15 +00:00
Maikel Linke
3e6db7fda4 Update spec of changed report link 
The link now contains the local test server instead of some fake domain.
 2023-11-15 10:29:05 +01:00
Maikel Linke
9f00817852 Use source of truth of url_options for report URLs 
The ActionController options were not set in testing nor Sidekiq jobs.
The now used config is always set in config/application.rb.
 2023-11-15 10:29:05 +01:00
Maikel Linke
20af19c912 Simplify report file storage 2023-11-15 10:29:05 +01:00
Maikel Linke
ff6bcb113f Create report file where the content is generated 
In the past, we needed the report blob to know when the report has been
finished and uploaded. But not we use cable_ready to notify when the
report is done and we don't need the blob in the controller.
 2023-11-15 10:29:05 +01:00
Maikel Linke
58d2e9d9aa Fix pending spec example and clarify displayed content 2023-11-15 10:28:45 +11:00
Maikel Linke
b626ec1cd7 Further reduce branching 
This is much easier to read.
 2023-11-15 10:13:24 +11:00
Maikel Linke
d0c07df0cf Avoid complexity of branch flags 2023-11-15 10:06:48 +11:00
filipefurtad0
a56f95d1e3 Uses more readable DB call 
Also makes some other minor improvements, like removing the rest case around editing ajustment types, something which we don't really need a test for, as it should not occur in the app
 2023-11-14 14:40:21 +00:00
filipefurtad0
612125b918 Updates create/delete adjustments tests 
Creating and deleting adjustments will change associated attributes such as the payment state of the order which triggers a new invoice
 2023-11-13 23:20:50 +00:00
filipefurtad0
eea15089d3 Updates state change tests 
Cancelling orders will change associated attributes such as payment_state which is triggers a new invoice
 2023-11-13 23:19:40 +00:00
filipefurtad0
e7c2b52f52 Updates pending example 
..however: creating and deleting adjustments are still not passing when can_update_latest_invoice? is called over the order. @abdellani, I think I need your help on this one, I was not able to progress any further
 2023-11-13 23:19:40 +00:00
filipefurtad0
9057ffd6c0 Fixes pending test case 2023-11-13 23:19:40 +00:00
binarygit
249c0029dd Improve tests 2023-11-13 21:31:41 +05:45
binarygit
f52c7e8a5d Rename richtext controller and write specs 2023-11-13 21:31:41 +05:45
Mohamed ABDELLANI
847c3af4da update WeightsAndMeasures#scales_for_variant_unit to ignore available untis when needed 2023-11-13 09:59:14 +01:00
David Cook
b872d7c308 Re-arrange spec 
Best viewed with white-space ignored
 2023-11-13 09:29:31 +01:00
David Cook
91cb3df215 Use named config method 
And mock the preference value, rather than setting it. Before, the set preference could have leaked to other tests.
(I noticed that it was already like this in product_import_spec.rb)
 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
72d854487a update VariantUnitManager#compatibleUnitScales to return units that are selected 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
864f63b7b0 update VariantUnitManger specs 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
a9d85fd08f fix existing tests 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
e10d441153 load GeneralSettingsHelper#all_units from WeightsAndMeasures::UNITS 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
fb24678654 update units list on Spree::Admin::GeneralSettingsHelper#all_units 
added a test to make sure that all units on WeightsAndMeasures::UNITS are list on all_units
 2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
b3b86c428c test tax totals on the printed version of the invoice (v3) 2023-11-13 07:48:59 +01:00
Mohamed ABDELLANI
e37f9e54fd reimplement "order with taxes" tests under "invoices feature enabled" 2023-11-13 07:39:55 +01:00
Mohamed ABDELLANI
c759a0f646 move tests under shared_examples "order with tax" to context "when invoice feature is not enabled" 2023-11-13 07:39:55 +01:00
Mohamed ABDELLANI
13bfbc21e0 remove unecessary instructions from "Check display on each invoice: legacy and alternative" 2023-11-13 07:39:55 +01:00
Mohamed ABDELLANI
4eedf74ecd remove unecessary instructions from "contains right Payment Description at Checkout information" 
1.When the user tries to print an invoice for an order (that doesn't have any previous invoices), an invoice will be generated automatically.
2.When the user tries to print an invoice for an order without specifing the id of the invoice, he'll get the latest invoice
 2023-11-13 07:39:55 +01:00
Mohamed ABDELLANI
5be8ec0c5a set completed_at on the order used for testing 2023-11-13 07:39:55 +01:00
Mohamed ABDELLANI
1724e1d626 fix invoice feature flag enabling 2023-11-13 07:39:55 +01:00
Maikel Linke
6ce3572b24 Stabilise spec with sleep 
I didn't look into what's going wrong here. A sleep is not ideal but
better than a retry.

That page needs a rewrite anyway and therefore I don't want to invest
more work now.
 2023-11-13 14:21:10 +11:00