David Cook
fd5e5ebc64
Revert "Actually we don't need the additional paths"
...
This reverts commit b2eec79a29
2025-02-19 11:19:45 +11:00
David Cook
e50bd196d0
Update spec/system/admin/configuration/states_spec.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-02-13 09:11:55 +11:00
David Cook
c29b15d5f6
Wait less for condition
...
This code was waiting up to 20 seconds, but only checking every two seconds, which means it could be wasting up to 2s everytime it runs.
Instead, we can use Capybara's waiting mechanism, which by default waits up to 20 seconds (but no doubt is optimised to be much more responsive).
2025-02-12 15:09:46 +11:00
David Cook
f55cdcdd34
Ensure pages have contextual navigation
...
It would be good to know if it breaks!
I didn't think it worth updating every single settings specs to test for this...
But I've tested on the 'general settings' page because this is the default page when clicking on 'Configuration'.
2025-02-12 15:01:54 +11:00
David Cook
b2eec79a29
Actually we don't need the additional paths
2025-02-04 10:50:18 +11:00
David Cook
4ee35fc1ab
Move select2 images to asset pipeline
...
png sprites? That was a flashback..
2025-02-03 17:45:30 +11:00
David Cook
d8a58b2257
remove old comment
2025-02-03 17:44:14 +11:00
David Cook
177445521c
Move most images to asset pipeline
...
Webpacker still needs to know about them in order to build links.
2025-02-03 17:44:13 +11:00
David Cook
b217e9da96
Move images to asset pipeline
2025-02-03 16:29:30 +11:00
filipefurtad0
c08f925ff8
Update all locales with the latest Transifex translations
2025-01-30 22:03:47 -06:00
Filipe
54fad01a91
Merge pull request #13104 from mkllnk/test-seeds
...
Remove unused preference default_country_id
2025-01-30 21:59:46 -06:00
Filipe
32c4b4557b
Merge pull request #13086 from rioug/fix-tax-rate-refund
...
Remove tax rate refund code path
2025-01-30 21:54:30 -06:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Maikel
139dba6637
Merge pull request #13108 from dacook/reduce-rack-timeout-logs
...
Log rack-timeout ready and completed messages in DEBUG mode
2025-01-31 10:49:41 +11:00
David Cook
a0833af780
Log rack-timeout ready and completed messages in DEBUG mode
...
Instead of default INFO, because it pollutes the logs unnecessarily.
Error messages will still be logged the same as before.
2025-01-30 10:20:58 +11:00
Maikel
0797614769
Merge pull request #13106 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.4.2
...
chore(deps): bump tom-select from 2.4.1 to 2.4.2
2025-01-30 08:51:23 +11:00
dependabot[bot]
c84881252c
chore(deps): bump tom-select from 2.4.1 to 2.4.2
...
Bumps [tom-select](https://github.com/orchidjs/tom-select ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/orchidjs/tom-select/releases )
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.4.1...v2.4.2 )
---
updated-dependencies:
- dependency-name: tom-select
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-01-29 09:19:24 +00:00
Gaetan Craig-Riou
1ee2f4d18e
Merge pull request #13103 from mkllnk/gmaps-region-code
...
Simplify default country code lookup
2025-01-29 09:54:43 +11:00
Maikel Linke
6885184bcc
Remove unused preference default_country_id
2025-01-28 16:31:45 +11:00
Maikel Linke
1a393592b4
Reduce database writes seeding zones
2025-01-28 15:47:32 +11:00
Maikel
f8e55f1eb3
Merge pull request #13098 from cillian/osm-marker-positioning
...
Specify OpenStreetMap marker size and tip position so they are positioned correctly at all zoom levels
2025-01-28 13:40:18 +11:00
Maikel Linke
e1f62148c9
Remove now unnecessary country seeding for assets
2025-01-28 13:26:42 +11:00
Maikel Linke
ea6efa9164
Simplify default country code lookup
...
The code was using the code from the environment variables to load a
reocrd from the database to then return the initial code again.
The only use of `DefaultCountry.code` is currently in the geocoder JS
compilation. Now it doesn't need the database anymore.
2025-01-28 13:22:26 +11:00
Maikel
4b6c3fe1d0
Merge pull request #13099 from rioug/compile-test-asset-path
...
Specify test assets output path
2025-01-28 10:58:41 +11:00
Gaetan Craig-Riou
3bf01602d9
Specify test assets output path
...
Test assets need to be compiled to a specific path for system test
to work. It was mistakenly remove here :
https://github.com/openfoodfoundation/openfoodnetwork/pull/13096/files#diff-46b7721b943217c3670f6818a10c2661ec1f9f72dfea66469fd9f026dc74c36a
2025-01-27 14:14:54 +11:00
Gaetan Craig-Riou
fa4785bc85
Merge pull request #13096 from mkllnk/assets
...
Compile assets on demand in test local environment
2025-01-27 13:00:10 +11:00
Gaetan Craig-Riou
6fb86dd4ac
Merge pull request #13093 from mkllnk/dfc-token-error
...
Handle wrong OIDC tokens gracefully
2025-01-27 12:56:23 +11:00
Gaetan Craig-Riou
c4d74ac10d
Apply Rubocop linting
2025-01-27 11:03:54 +11:00
Gaetan Craig-Riou
6ef73acfcd
Fix seeding file for Spree::Zones
2025-01-27 11:03:48 +11:00
David Cook
ffad3f249b
Update comment
...
See: https://github.com/openfoodfoundation/openfoodnetwork/blob/master/spec/system/admin/adjustments_spec.rb
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
be78c2ac41
Fix system admin adjustment spec
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
900b751559
Revert change from d58aa2b14f44fa15b67a18cf3457eccaaca5a56c
...
Turns out there seem to be a legitimate use for this code, see
spec/system/admin/adjustments_spec.rb ie, adding a manual discount to an
order using an adjustment.
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
cd7e92c6ca
Fix various spec
2025-01-27 11:02:41 +11:00
Gaetan Craig-Riou
6b7373e4cf
Clean up spec syntax
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
6e8eb443c1
Consolidate .adjust specs
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
42df158669
Fix TaxRate#compute_amount
...
Remove the code path that can create a tax refund, it is unlikely to
happen with the configuration our instances are using. Instead return 0
do that no adjustment gets created
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
5e42a9be55
Fix TaxRate spec to work with the zone changes
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
d4a060c6a2
Fix Zone system spec
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
f7998f6570
Fix zone new form to allow adding state or country
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
a953e3dde3
Fix Spree::Zone spec and factory
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
75c0752340
Sree::Zone, require at least one member
...
Add validations and specs
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
bcb4525cdd
Clean up spec, use describe instead of context
...
Although `describe` and `context` are functionally equivalent, they
don't convey the same message
2025-01-27 11:01:07 +11:00
Cillian O'Ruanaidh
ff7c1e6d1f
Specify OpenStreetMap marker size and tip position so they are positioned correctly at all zoom levels
2025-01-25 12:55:48 +00:00
Konrad
01036e6321
Merge pull request #13087 from mkllnk/stock-location
...
Remove class Spree::StockLocation
2025-01-25 12:41:37 +01:00
Maikel Linke
95625c16b2
Comment on seeds
2025-01-24 16:55:19 +11:00
Maikel Linke
690d137971
Combine rake tasks for efficiency
2025-01-24 16:54:56 +11:00
David Cook
09fe6d7542
Merge pull request #13091 from mkllnk/flaky-ship
...
Fix flaky spec of order shipment
2025-01-24 15:02:19 +11:00
David Cook
f6bd1c49ee
Apply suggestions from code review
2025-01-24 14:52:54 +11:00
David Cook
bb040812aa
Refactor spec
2025-01-24 14:49:18 +11:00
David Cook
e38d305ca1
Merge pull request #13089 from mkllnk/haml-up-remove
...
Remove unneeded HAML upgrade script
2025-01-24 14:23:56 +11:00
