Pau Pérez Fabregat a910fc50f5 Merge pull request #2926 from luisramos0/2-0-stable-oct-25 ...

[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)

2018-11-02 15:37:34 +01:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

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

controllers

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

2018-10-15 17:09:26 +01:00

features

Merge pull request #2926 from luisramos0/2-0-stable-oct-25

2018-11-02 15:37:34 +01:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

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

javascripts

Merge pull request #2821 from nikobozi/oc-clear-filter

2018-10-09 16:35:57 +02:00

jobs

Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending

2018-10-21 22:09:21 +01:00

lib

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

2018-10-15 17:09:26 +01:00

mailers

Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786

2018-09-29 23:31:11 +01:00

models

Merge pull request #2926 from luisramos0/2-0-stable-oct-25

2018-11-02 15:37:34 +01:00

performance

Revert "Refactor Order#current_order argument"

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

requests

In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments

2018-09-17 00:51:01 +01:00

serializers

Merge pull request #2817 from coopdevs/remove-reference-to-on-demand

2018-10-16 17:52:42 +02:00

services

Move all specs in subscription_form_spec temporarily to pending

2018-10-21 22:05:45 +01:00

support

Send confirmation emails immediately

2018-09-27 13:33:08 +10:00

factories.rb

Fix shipping_method basic test. Adapt to spree 2 that needs shipping_categories to be set and sets them on the base factory in a after_create block, the build command was not picking it up

2018-10-27 20:34:25 +01:00

spec_helper.rb

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

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