Maikel 5e82d38bec Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order ...

[Spree Upgrade] Move ProxyOrder controller to xdescribe

2018-11-20 16:38:42 +11:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

2018-05-04 11:52:08 -03:00

controllers

Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order

2018-11-20 16:38:42 +11:00

features

Fix order by changing expected results: order is paid.

2018-11-18 20:58:55 +00:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

2018-10-15 10:03:30 +02:00

javascripts

Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor

2018-11-02 16:57:28 +11:00

jobs

Merge branch 'master' into 2-0-stable-nov-8th

2018-11-08 11:18:54 +00:00

lib

Make some report specs xdescribe and leave them for spree upgrade phase 2

2018-11-13 14:53:42 +00:00

mailers

Merge branch 'master' into 2-0-stable-nov-8th

2018-11-08 11:18:54 +00:00

models

Merge pull request #3004 from luisramos0/2-0-mail-method-fix

2018-11-20 16:37:19 +11:00

performance

Revert "Refactor Order#current_order argument"

2018-06-05 18:42:41 +02:00

requests

Fix occurrences of order.shipping_method= by replacing with order.shipments=

2018-10-30 13:37:45 +00:00

serializers

Fix outdated credit card spec

2018-11-07 20:48:54 +00:00

services

Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout

2018-11-13 21:25:59 +00:00

support

Update test mail setup for Spree 2

2018-11-15 14:30:46 +11:00

factories.rb

Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test

2018-11-14 23:13:05 +00:00

spec_helper.rb

Merge branch 'master' into 2-0-stable-oct-25

2018-10-25 14:28:58 +01:00