Andy Brett
50296458b8
Merge pull request #7097 from luisramos0/rails-5-2-rspec-params
...
Rails 5 2 update Rspec controller syntax
2021-03-22 17:29:29 -07:00
Luis Ramos
e2ce6634df
Adapt specs to new rspec syntax without xhr
2021-03-22 20:43:48 +00:00
Pau Perez
ec4bae3995
Reproduce regression in a test
2021-03-22 19:01:17 +01:00
Pau Perez
5815d1a4a4
Make #outstanding_balance return an OrderBalance
...
This will let us branch by abstraction. All existing calls to
`#outstanding_balance` will go through `OrderBalance` hence, will
check the feature toggle.
Note that by default, `OrderBalance` will end up calling
`#old_outstanding_balance`. As the name states, that's exactly what
`#outstanding_balance` was so far. This means no consumers will see any
change in behavior. We just added on item in the call stack (sort of).
2021-03-22 11:45:12 +01:00
Cillian O'Ruanaidh
31f737422c
Pass in owner_id parameter correctly so admin/enterprises#create controller spec doesn't fail
2021-03-19 22:21:47 +00:00
Cillian O'Ruanaidh
f20cea7e4f
Allow people to set enterprise latitude/longitude manually or automatically.
...
This for new changes to the enterprise registration/signup flow where a map will be displayed when people are filling in their address. On this map people can check the geocoder has geocoded their address correctly and if not they can manually adjust their latitude/longitude on the map.
But currently every time someone changes their address in the Admin > Enterprise > Address section the address would automatically be geocoded so this could overwrite the latitude/longitude that was set during sign up. To prevent the latitude/longitude from being overwritten this add's a checkbox which people need to explicity click if they want their address to be automatically geocoded, otherwise it will just use the manually configured latitude/longitude.
Note this new feature which allows people to select their location on a map during registration only works with Google maps so far. So if an instance is using Open Street Map this change also adds support for passing a :use_geocoder parameter to the Api::EnterprisesController during registration so that the address will be geocoded on the backend without the use of a map.
2021-03-19 21:43:29 +00:00
Andy Brett
80d90700c4
Merge pull request #7142 from coopdevs/tiny-improvement-of-specs
...
Tiny improvement of specs using OutstandingBalance class
2021-03-18 11:34:52 -07:00
Andy Brett
afa7269f48
Merge branch 'master' into render_plain
2021-03-18 10:53:13 -07:00
Pau Perez
5ee647fd7c
Improve specs
...
Better to rely on a verifying double and reveal our intentions using
`subject` instead.
2021-03-18 15:55:54 +01:00
Matt-Yorkley
3ed8dbe3b3
Merge pull request #7146 from Matt-Yorkley/deprecations
...
Deprecations
2021-03-18 11:25:14 +01:00
Andy Brett
b8629e847c
Merge pull request #7014 from andrewpbrett/canceled-order-payments
...
Add resumed to list of allowable order states to view the payment tab
2021-03-17 10:46:51 -07:00
Matt-Yorkley
237075dd47
Replace deprecated before_filter syntax
2021-03-17 15:15:26 +00:00
Luis Ramos
25e0262364
Adapt spec to new rspec syntax with params and no xhr
2021-03-16 23:31:43 +00:00
Luis Ramos
f710bbed3e
Convert calls to xhr to post or put with xhr: true
2021-03-16 23:31:43 +00:00
Luis Ramos
58c3c49cfb
Adapt to new rspec syntax
2021-03-16 23:31:43 +00:00
Luis Ramos
53d758ca21
Replace render text with render plain for rails 5.1
2021-03-16 23:13:58 +00:00
filipefurtad0
2e870ed7bc
replace update! w/ reload; remove assertion
2021-03-16 22:02:26 +00:00
filipefurtad0
87e4b5e49d
covers payment_state changes from item deletion
2021-03-16 22:02:26 +00:00
Andy Brett
0d364c6b69
Merge pull request #7110 from Matt-Yorkley/payment-capture-error
...
Fix payment capture handling in Api::OrdersController
2021-03-16 10:41:43 -07:00
Andy Brett
e8a256ecc5
Merge pull request #7132 from Matt-Yorkley/reload-deprecations
...
Replace deprecated use of :reload argument
2021-03-16 09:31:24 -07:00
Matt-Yorkley
2d9d293405
Replace deprecated use of :reload argument
2021-03-16 12:04:35 +00:00
Andy Brett
ffe9d4737c
Merge pull request #7114 from coopdevs/extract-spec-file
...
Move invoice-related specs to their own file
2021-03-15 15:11:14 -07:00
Matt-Yorkley
657291df90
Update order total when editing admin adjustments
2021-03-15 11:46:14 +00:00
Pau Perez
7a3121b624
Move invoice-related specs to their own file
...
The `Spree::Admin::OrdersController`'s test file quite long (as well as
the controller itself) but it'll grow more in the upcoming commits.
That's just a symptom of that controller having too many
responsibilities. It does much more than CRUD on `Spree::Order` (the
Rails convention).
Things like invoices are an entity on their own and would better fit
into a `InvoicesController`. Hopefully, splitting up the tests is hint
for the next dev to do that.
2021-03-15 12:45:27 +01:00
Matt-Yorkley
3219ea231d
Ensure order association is set correctly when adding admin adjustments
2021-03-15 11:18:14 +00:00
Matt-Yorkley
5354c63d9a
Fix payment capture handling in Api::OrdersController
...
Fixes:
NoMethodError: undefined method `t' for #<Api::OrdersController:0x0000000013834290>
Location
app/controllers/api/orders_controller.rb:50 - payment_capture_failed
2021-03-15 10:36:07 +00:00
Matt-Yorkley
707d089419
Update type handling in PaymentMethodsController and add tests
2021-03-13 10:57:54 +00:00
Matt-Yorkley
6d51ece69c
Tidy up payment method params
2021-03-13 10:57:51 +00:00
Matt-Yorkley
9e83cb65db
Set concurrency spec to pending
...
It's not working at all in Rails 5. There's new concurrency modules in Rails 5, we should investigate them...
2021-03-11 12:19:55 +00:00
Matt-Yorkley
83278b17db
Fix test controller issue
2021-03-11 12:19:55 +00:00
Matt-Yorkley
bd408e02b0
Update OrderCyclesController params usage
2021-03-11 12:19:55 +00:00
Matt-Yorkley
0393ea4219
Update variant params in CartController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
ec597aab1a
Fix params issue in ReportsController expectation
2021-03-11 12:19:55 +00:00
Matt-Yorkley
dcecfaea87
Fix params issues in OrderCyclescontroller spec
2021-03-11 12:19:54 +00:00
Matt-Yorkley
fd1b14ca4a
Fix string/integer issues in states controller spec
2021-03-11 12:06:00 +00:00
Matt-Yorkley
009844bfe7
Update expected params in reports controller tests
2021-03-11 12:06:00 +00:00
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
Andy Brett
05a074d33a
Merge pull request #7041 from Matt-Yorkley/adjustments-set-eligibility
...
[Adjustments] Remove Adjustment#set_eligibility
2021-03-09 13:33:21 -08:00
Pau Perez
333c669fbf
Remove puts debugging in tests
2021-03-09 16:01:55 +01:00
Andy Brett
95c232dfe7
add spec for a resumed order
2021-03-08 08:54:28 -08:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Matt-Yorkley
945605e3a8
Rename Shipment #adjustment to #fee_adjustment for clarity
2021-03-04 14:27:02 +00:00
Matt-Yorkley
bcbea618e8
Fix adjustment spec
...
The tested adjustment isn't found correctly if it isn't associated to the order...
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0de09da84
Update order correctly in ReturnAuthorizationsController
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f94f424b63
Update fee fetching in controller tests
2021-03-04 14:27:02 +00:00
Matt-Yorkley
045cdec23c
Update OrderDetailedSerializer
2021-03-04 14:27:02 +00:00
Andy Brett
a02065b66f
allow access to payments tab for canceled orders
2021-03-01 19:51:50 -08:00
Andy Brett
448c0e0ce3
Remove duplicate specs
...
The second of these is flaky; moreover, the OrdersController doesn't specifically have a method that they're testing. I think the ready_to_capture behaviors is adequately covered by 006236b8dd/spec/serializers/api/admin/order_serializer_spec.rb (L39-L68)
2021-02-27 15:05:11 -08:00
Andy Brett
bc7477795c
Merge pull request #6910 from andrewpbrett/remove-order-capture
...
Make orders not capturable if they have a payment pending authorization
2021-02-24 12:20:43 -08:00
