Luis Ramos
a6d7acb6f1
Convert spec to modern rspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125
Move Base splitter from main app models to order management engine services
2020-07-02 21:24:14 +01:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Cillian O'Ruanaidh
0ef3a7e24f
Fix some more code climate violations for bulk coop specs which have been moved to the order management engine.
2020-06-13 16:23:11 +01:00
Cillian O'Ruanaidh
fdf0d92366
Move feature spec for bulk coop report to the order management engine.
2020-06-13 15:52:42 +01:00
Cillian O'Ruanaidh
ba126d5afc
Move the bulk coop controller specs to the order management engine.
...
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
3abcb5b23c
Don't move the :parameter_not_allowed_error translation to a different scope yet.
...
It will make it harder to merge and deploy this PR if every translation locale file has to be updated too.
2020-06-13 15:37:44 +01:00
Cillian O'Ruanaidh
bcf79ef803
Fix code climate violations related to removing blockenspiel.
2020-06-13 13:27:44 +01:00
Cillian O'Ruanaidh
6dbb6f3f09
Add an underscore before unused method arguments rather than an empty splat operator so it's easier to understand what is being passed in.
2020-06-13 13:09:09 +01:00
Cillian O'Ruanaidh
293e8949a9
Remove unused AuthenticationWorkflow module from the BulkCoopReport specs.
2020-06-13 12:59:23 +01:00
Cillian O'Ruanaidh
bfc6daf076
Remove duplicate PackingReport tests from the BulkCoopReport spec.
...
These tests already exist in spec/lib/open_food_network/packing_report_spec.rb:72
2020-06-13 12:57:14 +01:00
Cillian O'Ruanaidh
ed82c7e3db
BulkCoopReport has been moved to the engines/order_management so move it's spec there too.
2020-06-13 12:51:29 +01:00
Cillian O'Ruanaidh
f90969134d
Fix a couple of Rubocop violations.
2020-06-05 20:03:17 +01:00
Cillian O'Ruanaidh
bafa8beab3
Use :parameter_not_allowed_error_message to from base Reports::Authorizer.
2020-06-05 17:05:26 +01:00
Cillian O'Ruanaidh
e58852289f
Move the :require_valid_datetime_range method to OrderManagement::Reports::Parameters::Base so it can be reused on multiple reports.
2020-06-05 16:58:56 +01:00
Cillian O'Ruanaidh
9172606780
Allow the order management report partial to be reused on different reports.
2020-06-05 16:51:43 +01:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Pau Perez
815cd73ff3
DRY specs
2020-05-29 11:15:47 +02:00
Pau Perez
06b7a95fb1
DRY duplicate subscription declaration
2020-05-28 14:00:53 +02:00
Pau Perez
a33396984f
Fix and DRY specs
2020-05-22 18:17:59 +02:00
Pau Perez
d9686d6982
Enable spec files to be executed alone
...
This fixes the annoying error
```
NameError:
uninitialized constant OrderManagement::Subscriptions::Whatever
```
and let's you execute the spec file in isolation. It slows down way too
much having the run the entire engine test suite while developing. And
it makes me nervous too.
2020-05-22 15:55:03 +02:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Pau Perez
ee94101edd
Log subs jobs to DJ's log file
...
There's a bunch of logging bits we need to find out what happened in
`#5294`, the first of which is logging as we are used to for Rails
itself. Turns out we were already logging but the log lines weren't
displayed.
That's because workers have no access to the Rails logger unless we hack
things a bit in the config/initializer. If we want to keep DJ's logs in
a different file, which I think is good for debugging purposes, we need
to diverge from Rails.logger.
However, there's no access to Delayed::Worker.logger in custom job
classes either so there's no way other than mimicking that logger's format
if we want log lines to be consistent.
Now the current logs will see the light like:
```
2020-05-07T14:09:42+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) RUNNING
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 1
2020-05-07T14:09:42+0000: Issue in Subscription Order 2: complete
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 7
2020-05-07T14:09:42+0000: Issue in Subscription Order 3: complete
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) COMPLETED after 0.3378
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] 1 jobs processed at 2.8054 j/s, 0 failed
```
We'll see if we need to format these messages differently to make them
more greppeable.
2020-05-07 17:21:39 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
868929eed3
Merge pull request #4993 from luisramos0/move_ent_fees
...
Change engine routes to better work with specs in rails 4
2020-04-28 11:48:41 +01:00
Luis Ramos
d482cccefe
Use OrderPaymentFinder methods instead of payments.last and payments.pending.last
2020-04-23 16:08:10 +10:00
Luis Ramos
357a88fa22
Merge pull request #4786 from luisramos0/stripe_sca_extra_subs_fix
...
Make StripeSCA (with new authorize/purchase workflow) work with Subscriptions again
2020-04-13 17:21:53 +01:00
Luis Ramos
d18a06a0f7
Merge pull request #4783 from luisramos0/stripe_sca_extra_subs
...
Move all subscriptions services to the OrderManagement engine
2020-04-06 20:20:02 +01:00
Luis Ramos
fa4b8832e9
Fix timezone mix up in specs
...
Converting times with timezones to string was ignoring the timezone and this making the start date be before the end date in this spec
2020-04-04 16:39:23 +01:00
Luis Ramos
b33969e6a2
Adapt to slightly different rails 4 sql data conversion
2020-03-21 12:50:34 +00:00
Luis Ramos
3f5a964dec
Move enterprise_fee_summaries_spec to order_management engine, moving
...
translation keys for the views and adapting some routes
2020-03-20 11:07:23 +00:00
Luis Ramos
b4befea606
Fix namespace in spec
2020-03-20 11:07:23 +00:00
Luis Ramos
e209452f8b
Make engine routes just prepend to apps routes instead of creating engine routes
...
This makes things a bit simpler in terms of routing, we avoid a problem running specs and we can still have the engine routes separated in specific files
2020-03-20 11:07:23 +00:00
Luis Ramos
a8078b22f8
Move enterprise fees summaries controller and views to ordermanagement engine
2020-03-20 11:07:23 +00:00
Luis Ramos
26769b4150
Add StripeSCA payment authorize and use it both subs_confirm job as well as on teh checkout stripe redirect
2020-03-16 20:04:59 +00:00
Luis Ramos
84745e4ccb
Add stripe payment setup spec and make minor tweaks to the code itself.
...
Also, add a missing . to card_set? that eanbles it! If the card was
already set, it would anyway set the default card. Now it will use the
defined card if there is one already.
2020-03-16 20:03:12 +00:00
Luis Ramos
aac7a5e559
Adapt PaymentSetup spec to new version and remove some private method testing (payment) as well as some tests testing order.pending_payments logic
2020-03-16 20:03:12 +00:00
Luis Ramos
0a2941ed96
Extract StripePaymentSetup from PaymentSetup
2020-03-16 20:03:12 +00:00
Luis Ramos
f8a4f00d52
Fix rubocop issues in subs specs
2020-03-16 17:20:01 +00:00
Luis Ramos
29377bbff9
Move 5 subscriptions services from app/services to the engines/order_management/app/services
2020-03-16 17:20:01 +00:00
Luis Ramos
f68d0c2a0f
Remove Subscription from the name of the subscription summarizer and summary because it is already in the namespace
2020-03-16 17:20:01 +00:00
Luis Ramos
3901c49af9
Fix rubocop issues
2020-03-16 17:20:01 +00:00
Luis Ramos
ae0ceb61a1
Move ProxyOrderSyncer to OrderManagement engine
2020-03-16 17:20:01 +00:00
Luis Ramos
fb1c825fbc
Move both subscription summarizer and subscription summary to order management engine
2020-03-16 17:20:01 +00:00
Luis Ramos
e36b0249b9
Use nested module names to fix rubocpo issue
2020-03-16 17:20:01 +00:00
