Rachel Arnould
96d2021b72
Merge branch 'master' into buu/add-product-images-11065
2024-01-25 16:32:45 +01:00
David Cook
a005069394
Merge pull request #12041 from mkllnk/migrations
...
Remove migrations with faulty ids
2024-01-25 17:29:23 +11: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
a915182bf8
Add tests for image controller
2024-01-25 14:14:58 +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
ca12eab4bb
Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report
...
Include vouchers in report: Enterprise Fees With Tax Report By Order
2024-01-24 22:57:48 +01:00
Konrad
5377304190
Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller
...
Replace toggle_button_disable controller with generic toggle_control controller
2024-01-24 16:39:26 +01: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
98545741e6
Add tomselect_select helper
...
When using `tomselect_search_and_select` and searching isn't really
required it leaves the dropdown option open. It can then cause problem
when trying to interact with other element in the page. This happens
because clicking on the chosen option happena before the searching
finishes.
We can now use `tomselect_select` when searching is not actually
required.
It should not be a problem when search is required, as capybara will
wait for the option to appear on the page before clicking.
2024-01-24 14:47:21 +11:00
Maikel Linke
d12c0a7d9d
Fixup: Remove unused method from spec
2024-01-24 12:09:02 +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
Maikel Linke
e25464b38a
Re-record stripe API requests
2024-01-22 10:21:15 +11:00
Filipe
487a7b2257
Merge pull request #12058 from openfoodfoundation/dependabot/bundler/stripe-10.5.0
...
Filter out Stripe client_id
2024-01-19 10:36:34 +00:00
David Cook
40166bf3e8
Update spec/support/vcr_setup.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2024-01-19 09:55:39 +11:00
David Cook
df82db9a95
Fix Layout/LineLength
2024-01-19 09:24:30 +11:00
Ahmed Ejaz
cb9c2963af
11768: add roundoff
...
- Fix lint issues
2024-01-19 01:52:24 +05:00
Ahmed Ejaz
a3592cb14a
11768: add specs
...
- For applied_voucher_rate method in order
2024-01-19 01:52:24 +05: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
cyrillefr
ca4aa645f7
Delete now ununsed stimulus controller toggle_button_disabled
...
- also delete one comment about replacing this controller with another
2024-01-18 10:10:49 +01:00
David Cook
6e522cb055
Filter out Stripe client_id
2024-01-18 12:47:02 +11:00
Maikel
08ca85250a
Merge pull request #12018 from openfoodfoundation/dependabot/bundler/stripe-10.5.0
...
Bump stripe from 10.3.0 to 10.5.0
2024-01-18 12:41:17 +11:00
David Cook
ccf0e78b91
Refactor
...
It's not as beautiful as I hoped, but it enforces the rule. Am I going too far? Probably.
2024-01-18 12:26:21 +11:00
David Cook
a2436e9a1a
Rename hidden keys
...
If they follow a rule, it reduces indirection and makes it easier to manage, I reckon.
2024-01-18 12:14:07 +11:00
David Cook
f348cbc10c
Update Stripe cassettes
...
Note that stripe_account_spec.rb:51 requires a special client_id
2024-01-17 15:16:52 +11:00
cyrillefr
8eb5ac990e
Replace toggle_button_disable ctrller with generic toggle_control ctrller
...
- add enableIfPresent method in toggle_control_controller.js to handle enabling on toggle
- add testing in the corresponding spec
- replace in view previous ctrler with intended generic toggle-control
2024-01-16 20:35:21 +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
Gaetan Craig-Riou
64043b820a
Merge pull request #12030 from mkllnk/connected-apps-visibility
...
Show Connected Apps only to enterprise managers
2024-01-15 15:24:29 +11:00
Maikel Linke
301add4992
Remove faulty migration generation
...
The long timestamps don't play well with Rails default timestamps for
migrations. They are always seen as the newest. Not using long
timestamps leads to duplicate timestamps though.
The better solution is to use `rails generate migration` and copy the
`change` method.
2024-01-15 14:36:23 +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
filipefurtad0
0a5982bb8f
Update all locales with the latest Transifex translations
2024-01-12 12:12:17 +00:00
filipefurtad0
6eb56fa79b
Update all locales with the latest Transifex translations
2024-01-12 11:59:48 +00:00
Maikel Linke
ad26a006e2
Remove unnecessary spec helper module
...
These shared examples were used in only one spec file. It's much easier
to read having all the related specs in one file instead of hiding some
in a helper module.
It's also one less file to load whenever we run specs.
2024-01-12 17:18:07 +11:00
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 Linke
95c6a56e2e
Simplify loading of default tax category
...
The logic doesn't change but I simplified it and added more detailed
specs.
2024-01-12 17:06:24 +11:00
Maikel Linke
30b5d065c1
Replace deprecated swagger syntax
2024-01-11 15:13:41 +11:00
Maikel Linke
78e42ec664
Show Connected Apps only to enterprise managers
...
Super-admins also saw that tab but connecting an app doesn't work unless
you are a manager of that enterprise.
2024-01-11 12:20:40 +11:00
Maikel Linke
f480997754
Spec admin enterprise menu helper
...
There was no spec despite lots of logic. And I want to add more logic.
2024-01-11 12:14:09 +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
