Luis Ramos
09b7aa134b
Ammend payment method spec and specify a calculator so that the default calculator is not the spree one that is based on a calculator that does not exist in OFN: Spree::Calculator::FlatRate
2020-08-07 18:36:59 +01:00
Luis Ramos
1b66a72c7f
Run transpec
2020-08-07 14:03:15 +01:00
Luis Ramos
798194c03e
Fix payment_method spec
2020-08-07 14:02:05 +01:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Luis Ramos
d746ae3d9e
Fix easy rubocop issues
2020-08-07 13:28:09 +01:00
Luis Ramos
621e2a3132
Run rubocop autocorrect
2020-08-07 13:16:38 +01:00
Luis Ramos
abaa66cc14
Bring models from spree_core
2020-08-07 13:06:16 +01:00
Luis Ramos
f14bb280c1
Merge pull request #5680 from cillian/prevent-blank-open-street-map
...
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
2020-08-05 20:27:40 +01:00
Luis Ramos
f093656c6b
Merge pull request #5763 from luisramos0/mailers
...
Bring Mailers from Spree and make order shipped email translatable
2020-08-05 18:09:12 +01:00
Pau Pérez Fabregat
6e1dd78e9f
Merge pull request #5828 from luisramos0/ent_user
...
Clean up AuthenticationWorkflow spec helper
2020-08-04 12:07:54 +02:00
Pau Perez
6e39ab779c
Make RSpec infer the file type from its location
...
Apparently, although we tend to add the type of spec file some RSpec
methods are not working without it. We're getting:
```
NoMethodError:
undefined method `helper' for RSpec::ExampleGroups::SpreeSharedOrderDetailsHtmlHaml:Class
```
```
NameError:
undefined local variable or method `controller' for #<RSpec::ExampleGroups::SpreeAdminUsersController::AuthorizeAdmin:0x00007fa8b32addf8>
# ./spec/controllers/spree/admin/users_controller_spec.rb:10:in `block (3 levels) in <top (required)>'
```
It needs more investigation but another day.
2020-08-04 11:24:49 +02:00
Pau Perez
9ef59f440b
Remove commented out includes
2020-08-04 08:50:14 +02:00
Pau Perez
61c14cb61d
Remove unneeded RSpec config block
...
Spec files individually include the module and we specify the type of
spec in each RSpec's describe so none of this settings are needed. They
are just Spree's legacy I bet.
2020-08-04 08:48:08 +02:00
Luis Ramos
327d6c43d9
Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
...
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
cc7363d9e7
Merge pull request #5824 from luisramos0/improve_checkout
...
Reset order state to cart in case the stripe SCA authorization step fails
2020-08-01 15:53:41 +01:00
Luis Ramos
ca9898839a
Confirm! is deprecated and only redirects to confirm now in devise 3.5
2020-07-31 09:05:42 +01:00
Luis Ramos
f31d790714
Add auth spec to cover case where user tries to reset password before confirming their email
2020-07-31 09:05:42 +01:00
Luis Ramos
0f29806198
Adapt code to devise 3.2 where the reset_password_token stored in the db is a encrypted version of the token sent in the email
...
In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token
So we regenerate the reset password token so that it can know what's the raw value for the redirect
The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
2020-07-31 09:05:42 +01:00
Luis Ramos
c0f9f8c8bf
Remove comment refering to old spree upgrade
2020-07-31 09:05:42 +01:00
Luis Ramos
a2ae78bde9
Replay commit from spree_auth_devise that upgrades to devise 3
...
fe7941f674
2020-07-31 09:05:42 +01:00
Luis Ramos
e739c5185e
Add specs to verify that Spree::Core::Gateway exceptions are handled correctly
2020-07-29 23:56:52 +01:00
Luis Ramos
ad00971ca8
Improve readability and add bugsnag error (now in the checkout_failed method) when checkout_fails while handling stripe redirect
2020-07-29 22:50:18 +01:00
Pau Perez
c923edd3bb
Replace hardcoded URL with path helper
2020-07-29 11:36:49 +02:00
Maikel Linke
fe0c04b650
Complete renaming of AdvanceOrderService to OrderWorkflow
2020-07-29 12:24:18 +10:00
Luis Ramos
26eee4631f
Rename AdvanceOrderService to OrderWorkflow
2020-07-28 23:40:49 +01:00
Luis Ramos
e80337a458
Transpec checkout_spec
2020-07-28 23:29:49 +01:00
Luis Ramos
51de5269dc
Fix specs in checkout_spec
2020-07-28 23:29:49 +01:00
Luis Ramos
e99f0dc6b7
Rubocop autocorrect and easy rubocop issues
2020-07-28 23:29:49 +01:00
Luis Ramos
d8a96c9d34
Bring order checkout workflow and some of its specs from spree_core
2020-07-28 23:29:49 +01:00
Luis Ramos
d673f278ce
Add unit test to order.charge_shipping_and_payment_fees!
2020-07-27 21:27:23 +01:00
Luis Ramos
a002ec1894
Simplify login_as_admin by using existing factory admin_user
2020-07-27 16:02:59 +01:00
Luis Ramos
ecc58cedd9
Fix navigation problem in spec
2020-07-27 16:02:59 +01:00
Luis Ramos
27ace50eb7
Fix general settings path in specs
2020-07-27 16:02:57 +01:00
Luis Ramos
4df81f0864
Remove unnecesasary and now broken require statement from spec and fix rubocop todo files
2020-07-27 15:32:35 +01:00
Luis Ramos
95a9ca7775
Remove redundant method, login_as is the name of the test helper in warden
2020-07-27 15:32:35 +01:00
Luis Ramos
a2ebc614d9
Rename AuthenticationWorkflow to AuthenticationHelper
2020-07-27 15:32:35 +01:00
Luis Ramos
10b07aabd9
Rename quick_login_as to login_as
2020-07-27 15:32:35 +01:00
Luis Ramos
5738ec0542
Rename login_to_admin_and_visit to login_as_admin_and_visit
2020-07-27 15:32:34 +01:00
Luis Ramos
c6bb756531
Rename quick_login_as_admin to login_as_admin and also re-use login_to_admin_and_visit when applicable
2020-07-27 15:31:23 +01:00
Luis Ramos
8b04e45ea5
Create login_to_admin_and_visit to avoid loading the admin dashboard unnecessarily
...
This commit removes 19 unnecessary page loads of the admin dashboard
2020-07-27 15:31:11 +01:00
Luis Ramos
f1a3814c0d
Rename login_as_enterprise_user to a more specific name controller_login_as_enterprise_user
2020-07-27 14:44:25 +01:00
Luis Ramos
8e84754f35
Rename login_as_admin to a more specific name controller_login_as_admin
2020-07-27 14:44:25 +01:00
Luis Ramos
81710a2704
Remove now dead create_enterprise_user, the user factory should be used instead
2020-07-27 14:44:25 +01:00
Luis Ramos
1af4bf6994
Replace usage of create_enterprise_user with :user factory
2020-07-27 14:44:23 +01:00
Luis Ramos
3217b3ba86
Delete dead commented code
2020-07-27 12:28:53 +01:00
Luis Ramos
16b9c8c814
Replace usage of create_enterprise_user with :user factory
2020-07-27 12:28:33 +01:00
Cillian O'Ruanaidh
702669e61c
Merge branch 'master' into prevent-blank-open-street-map
2020-07-24 16:00:37 +01:00
Cillian O'Ruanaidh
cc317bc8c9
Move the :initialLatitude and :initialLongitude methods from the OpenStreetMap service to the MapCenterCalculator service.
2020-07-24 16:00:30 +01:00
Pau Perez
c0f72f89f2
Handle #refund! as we do with #credit!
2020-07-23 20:24:31 +02:00
Pau Perez
0f0a704147
Skip source validation when applying credit
...
The original payment may not be valid because its credit card may be
expired. Stripe gives this as a valid scenario returning a success and
we should do too.
When creating the credit payment we end up validating all sources in
a chain as follows.
```
Payment being persisted -> source payment -> original credit card.
```
The source payment was valid when created (It would not be persisted
otherwise) but its source card may now be expired, and that's legit.
There was also an issue with the `#invalidate_old_payments` callback. It
was causing the original payment to be validated again and thus the
credit payment failed to be persisted due to the original credit card
being expired. Switching this callback to use `#update_column` skips
validations and so we don't validate the source payment. We only care
about the state there, so it should be fine.
2020-07-23 20:24:31 +02:00
