solidus_core 2.5.2 → 2.6.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.yardopts +1 -0
- data/Rakefile +5 -0
- data/app/controllers/spree/base_controller.rb +2 -0
- data/app/helpers/spree/base_helper.rb +12 -8
- data/app/helpers/spree/checkout_helper.rb +2 -0
- data/app/helpers/spree/products_helper.rb +2 -0
- data/app/helpers/spree/store_helper.rb +2 -0
- data/app/helpers/spree/taxons_helper.rb +2 -0
- data/app/jobs/spree/promotion_code_batch_job.rb +3 -1
- data/app/mailers/spree/base_mailer.rb +2 -0
- data/app/mailers/spree/carton_mailer.rb +3 -1
- data/app/mailers/spree/order_mailer.rb +2 -0
- data/app/mailers/spree/promotion_code_batch_mailer.rb +2 -0
- data/app/mailers/spree/reimbursement_mailer.rb +2 -0
- data/app/mailers/spree/test_mailer.rb +2 -0
- data/app/models/concerns/spree/adjustment_source.rb +2 -0
- data/app/models/concerns/spree/calculated_adjustments.rb +2 -0
- data/app/models/concerns/spree/default_price.rb +2 -0
- data/app/models/concerns/spree/display_money.rb +2 -0
- data/app/models/concerns/spree/named_type.rb +2 -0
- data/app/models/concerns/spree/ordered_property_value_list.rb +2 -0
- data/app/models/concerns/spree/ransackable_attributes.rb +2 -0
- data/app/models/concerns/spree/user_address_book.rb +2 -0
- data/app/models/concerns/spree/user_api_authentication.rb +2 -0
- data/app/models/concerns/spree/user_methods.rb +2 -0
- data/app/models/concerns/spree/user_payment_source.rb +2 -0
- data/app/models/concerns/spree/user_reporting.rb +2 -0
- data/app/models/spree/ability.rb +2 -0
- data/app/models/spree/address.rb +2 -0
- data/app/models/spree/adjustment.rb +2 -0
- data/app/models/spree/adjustment_reason.rb +2 -0
- data/app/models/spree/asset.rb +2 -0
- data/app/models/spree/base.rb +2 -0
- data/app/models/spree/billing_integration.rb +2 -0
- data/app/models/spree/calculator.rb +2 -0
- data/app/models/spree/calculator/default_tax.rb +2 -0
- data/app/models/spree/calculator/distributed_amount.rb +16 -7
- data/app/models/spree/calculator/flat_percent_item_total.rb +2 -0
- data/app/models/spree/calculator/flat_rate.rb +2 -0
- data/app/models/spree/calculator/flexi_rate.rb +2 -0
- data/app/models/spree/calculator/free_shipping.rb +2 -0
- data/app/models/spree/calculator/percent_on_line_item.rb +2 -0
- data/app/models/spree/calculator/percent_per_item.rb +2 -0
- data/app/models/spree/calculator/price_sack.rb +2 -0
- data/app/models/spree/calculator/returns/default_refund_amount.rb +2 -0
- data/app/models/spree/calculator/shipping/flat_percent_item_total.rb +2 -0
- data/app/models/spree/calculator/shipping/flat_rate.rb +2 -0
- data/app/models/spree/calculator/shipping/flexi_rate.rb +2 -0
- data/app/models/spree/calculator/shipping/per_item.rb +2 -0
- data/app/models/spree/calculator/shipping/price_sack.rb +2 -0
- data/app/models/spree/calculator/tiered_flat_rate.rb +2 -0
- data/app/models/spree/calculator/tiered_percent.rb +2 -0
- data/app/models/spree/carton.rb +2 -0
- data/app/models/spree/classification.rb +2 -0
- data/app/models/spree/country.rb +2 -0
- data/app/models/spree/credit_card.rb +4 -2
- data/app/models/spree/customer_return.rb +3 -1
- data/app/models/spree/distributed_amounts_handler.rb +30 -26
- data/app/models/spree/exchange.rb +2 -0
- data/app/models/spree/fulfilment_changer.rb +2 -0
- data/app/models/spree/gateway.rb +2 -0
- data/app/models/spree/gateway/bogus.rb +2 -0
- data/app/models/spree/gateway/bogus_simple.rb +2 -0
- data/app/models/spree/image.rb +2 -0
- data/app/models/spree/inventory_unit.rb +4 -1
- data/app/models/spree/legacy_user.rb +2 -0
- data/app/models/spree/line_item.rb +2 -0
- data/app/models/spree/line_item_action.rb +2 -0
- data/app/models/spree/log_entry.rb +2 -0
- data/app/models/spree/option_type.rb +2 -0
- data/app/models/spree/option_value.rb +2 -0
- data/app/models/spree/option_values_variant.rb +2 -0
- data/app/models/spree/order.rb +8 -11
- data/app/models/spree/order/checkout.rb +5 -3
- data/app/models/spree/order/number_generator.rb +2 -0
- data/app/models/spree/order/payments.rb +2 -0
- data/app/models/spree/order_cancellations.rb +5 -3
- data/app/models/spree/order_capturing.rb +2 -0
- data/app/models/spree/order_contents.rb +5 -3
- data/app/models/spree/order_inventory.rb +2 -0
- data/app/models/spree/order_merger.rb +2 -0
- data/app/models/spree/order_mutex.rb +2 -1
- data/app/models/spree/order_promotion.rb +2 -0
- data/app/models/spree/order_shipping.rb +2 -0
- data/app/models/spree/order_taxation.rb +2 -0
- data/app/models/spree/order_update_attributes.rb +2 -0
- data/app/models/spree/order_updater.rb +3 -0
- data/app/models/spree/payment.rb +2 -0
- data/app/models/spree/payment/cancellation.rb +2 -0
- data/app/models/spree/payment/processing.rb +2 -0
- data/app/models/spree/payment_capture_event.rb +2 -0
- data/app/models/spree/payment_create.rb +2 -0
- data/app/models/spree/payment_method.rb +21 -8
- data/app/models/spree/payment_method/bogus_credit_card.rb +2 -0
- data/app/models/spree/payment_method/check.rb +2 -0
- data/app/models/spree/payment_method/credit_card.rb +2 -0
- data/app/models/spree/payment_method/simple_bogus_credit_card.rb +2 -0
- data/app/models/spree/payment_method/store_credit.rb +2 -0
- data/app/models/spree/payment_source.rb +2 -0
- data/app/models/spree/preference.rb +2 -0
- data/app/models/spree/price.rb +3 -1
- data/app/models/spree/product.rb +3 -1
- data/app/models/spree/product/scopes.rb +2 -0
- data/app/models/spree/product_option_type.rb +2 -0
- data/app/models/spree/product_promotion_rule.rb +2 -0
- data/app/models/spree/product_property.rb +2 -0
- data/app/models/spree/promotion.rb +2 -0
- data/app/models/spree/promotion/actions/create_adjustment.rb +3 -1
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +3 -1
- data/app/models/spree/promotion/actions/create_quantity_adjustments.rb +138 -132
- data/app/models/spree/promotion/actions/free_shipping.rb +3 -1
- data/app/models/spree/promotion/rules/first_order.rb +3 -1
- data/app/models/spree/promotion/rules/first_repeat_purchase_since.rb +3 -2
- data/app/models/spree/promotion/rules/item_total.rb +3 -1
- data/app/models/spree/promotion/rules/nth_order.rb +2 -1
- data/app/models/spree/promotion/rules/one_use_per_user.rb +3 -1
- data/app/models/spree/promotion/rules/option_value.rb +3 -1
- data/app/models/spree/promotion/rules/product.rb +5 -3
- data/app/models/spree/promotion/rules/store.rb +22 -0
- data/app/models/spree/promotion/rules/taxon.rb +6 -5
- data/app/models/spree/promotion/rules/user.rb +5 -3
- data/app/models/spree/promotion/rules/user_logged_in.rb +3 -1
- data/app/models/spree/promotion/rules/user_role.rb +3 -1
- data/app/models/spree/promotion_action.rb +2 -0
- data/app/models/spree/promotion_category.rb +2 -0
- data/app/models/spree/promotion_chooser.rb +2 -0
- data/app/models/spree/promotion_code.rb +2 -0
- data/app/models/spree/promotion_code/batch_builder.rb +31 -12
- data/app/models/spree/promotion_code_batch.rb +2 -0
- data/app/models/spree/promotion_handler/cart.rb +2 -0
- data/app/models/spree/promotion_handler/coupon.rb +8 -6
- data/app/models/spree/promotion_handler/free_shipping.rb +2 -0
- data/app/models/spree/promotion_handler/page.rb +2 -0
- data/app/models/spree/promotion_handler/shipping.rb +2 -0
- data/app/models/spree/promotion_rule.rb +2 -0
- data/app/models/spree/promotion_rule_role.rb +2 -0
- data/app/models/spree/promotion_rule_store.rb +10 -0
- data/app/models/spree/promotion_rule_taxon.rb +2 -0
- data/app/models/spree/promotion_rule_user.rb +2 -0
- data/app/models/spree/property.rb +2 -0
- data/app/models/spree/refund.rb +2 -0
- data/app/models/spree/refund_reason.rb +2 -0
- data/app/models/spree/reimbursement.rb +2 -0
- data/app/models/spree/reimbursement/credit.rb +2 -0
- data/app/models/spree/reimbursement/reimbursement_type_engine.rb +2 -0
- data/app/models/spree/reimbursement/reimbursement_type_validator.rb +2 -0
- data/app/models/spree/reimbursement_performer.rb +2 -0
- data/app/models/spree/reimbursement_tax_calculator.rb +2 -0
- data/app/models/spree/reimbursement_type.rb +2 -0
- data/app/models/spree/reimbursement_type/credit.rb +2 -0
- data/app/models/spree/reimbursement_type/exchange.rb +2 -0
- data/app/models/spree/reimbursement_type/original_payment.rb +2 -0
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +2 -0
- data/app/models/spree/reimbursement_type/store_credit.rb +2 -0
- data/app/models/spree/return_authorization.rb +2 -0
- data/app/models/spree/return_item.rb +3 -1
- data/app/models/spree/return_item/eligibility_validator/base_validator.rb +2 -0
- data/app/models/spree/return_item/eligibility_validator/default.rb +2 -0
- data/app/models/spree/return_item/eligibility_validator/inventory_shipped.rb +4 -2
- data/app/models/spree/return_item/eligibility_validator/no_reimbursements.rb +4 -3
- data/app/models/spree/return_item/eligibility_validator/order_completed.rb +4 -2
- data/app/models/spree/return_item/eligibility_validator/rma_required.rb +4 -2
- data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +4 -2
- data/app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb +2 -0
- data/app/models/spree/return_item/exchange_variant_eligibility/same_product.rb +2 -0
- data/app/models/spree/return_reason.rb +2 -0
- data/app/models/spree/returns_calculator.rb +2 -0
- data/app/models/spree/role.rb +2 -0
- data/app/models/spree/role_user.rb +2 -0
- data/app/models/spree/shipment.rb +10 -6
- data/app/models/spree/shipping_calculator.rb +2 -0
- data/app/models/spree/shipping_category.rb +2 -0
- data/app/models/spree/shipping_manifest.rb +2 -0
- data/app/models/spree/shipping_method.rb +10 -0
- data/app/models/spree/shipping_method_category.rb +2 -0
- data/app/models/spree/shipping_method_stock_location.rb +2 -0
- data/app/models/spree/shipping_method_zone.rb +2 -0
- data/app/models/spree/shipping_rate.rb +2 -0
- data/app/models/spree/shipping_rate_tax.rb +2 -0
- data/app/models/spree/state.rb +2 -0
- data/app/models/spree/state_change.rb +2 -0
- data/app/models/spree/stock/availability.rb +2 -0
- data/app/models/spree/stock/availability_validator.rb +2 -0
- data/app/models/spree/stock/content_item.rb +2 -0
- data/app/models/spree/stock/differentiator.rb +2 -0
- data/app/models/spree/stock/estimator.rb +3 -0
- data/app/models/spree/stock/inventory_unit_builder.rb +2 -0
- data/app/models/spree/stock/inventory_validator.rb +2 -0
- data/app/models/spree/stock/package.rb +2 -0
- data/app/models/spree/stock/quantifier.rb +2 -0
- data/app/models/spree/stock/shipping_rate_selector.rb +2 -0
- data/app/models/spree/stock/shipping_rate_sorter.rb +2 -0
- data/app/models/spree/stock/simple_coordinator.rb +2 -0
- data/app/models/spree/stock/splitter/backordered.rb +2 -0
- data/app/models/spree/stock/splitter/base.rb +2 -0
- data/app/models/spree/stock/splitter/shipping_category.rb +2 -0
- data/app/models/spree/stock/splitter/weight.rb +2 -0
- data/app/models/spree/stock/splitter_chain.rb +2 -0
- data/app/models/spree/stock_item.rb +2 -0
- data/app/models/spree/stock_location.rb +2 -0
- data/app/models/spree/stock_movement.rb +2 -0
- data/app/models/spree/stock_quantities.rb +2 -0
- data/app/models/spree/store.rb +24 -0
- data/app/models/spree/store_credit.rb +4 -1
- data/app/models/spree/store_credit_category.rb +2 -0
- data/app/models/spree/store_credit_event.rb +6 -0
- data/app/models/spree/store_credit_type.rb +2 -0
- data/app/models/spree/store_credit_update_reason.rb +2 -0
- data/app/models/spree/store_payment_method.rb +2 -0
- data/app/models/spree/store_selector/by_server_name.rb +2 -0
- data/app/models/spree/store_selector/legacy.rb +2 -0
- data/app/models/spree/store_shipping_method.rb +8 -0
- data/app/models/spree/tax/item_tax.rb +2 -0
- data/app/models/spree/tax/order_adjuster.rb +2 -0
- data/app/models/spree/tax/order_tax.rb +2 -0
- data/app/models/spree/tax/shipping_rate_taxer.rb +2 -0
- data/app/models/spree/tax/tax_helpers.rb +2 -0
- data/app/models/spree/tax/tax_location.rb +2 -0
- data/app/models/spree/tax_calculator/default.rb +2 -0
- data/app/models/spree/tax_calculator/shipping_rate.rb +5 -2
- data/app/models/spree/tax_category.rb +2 -0
- data/app/models/spree/tax_rate.rb +3 -1
- data/app/models/spree/tax_rate_tax_category.rb +2 -0
- data/app/models/spree/taxon.rb +4 -0
- data/app/models/spree/taxonomy.rb +2 -0
- data/app/models/spree/unit_cancel.rb +2 -0
- data/app/models/spree/user_address.rb +2 -0
- data/app/models/spree/user_class_handle.rb +2 -0
- data/app/models/spree/user_stock_location.rb +2 -0
- data/app/models/spree/validations/db_maximum_length_validator.rb +2 -0
- data/app/models/spree/variant.rb +16 -4
- data/app/models/spree/variant/price_selector.rb +2 -0
- data/app/models/spree/variant/pricing_options.rb +2 -0
- data/app/models/spree/variant/scopes.rb +2 -0
- data/app/models/spree/variant/vat_price_generator.rb +2 -0
- data/app/models/spree/variant_property_rule.rb +2 -0
- data/app/models/spree/variant_property_rule_condition.rb +2 -0
- data/app/models/spree/variant_property_rule_value.rb +2 -0
- data/app/models/spree/wallet.rb +3 -1
- data/app/models/spree/wallet/add_payment_sources_to_wallet.rb +2 -0
- data/app/models/spree/wallet/default_payment_builder.rb +2 -0
- data/app/models/spree/wallet_payment_source.rb +2 -0
- data/app/models/spree/zone.rb +3 -1
- data/app/models/spree/zone_member.rb +2 -0
- data/config/initializers/assets.rb +2 -0
- data/config/initializers/friendly_id.rb +2 -0
- data/config/locales/en.yml +13 -3
- data/db/default/spree/countries.rb +2 -0
- data/db/default/spree/refund_reasons.rb +2 -0
- data/db/default/spree/return_reasons.rb +2 -0
- data/db/default/spree/roles.rb +2 -0
- data/db/default/spree/shipping_categories.rb +2 -0
- data/db/default/spree/states.rb +2 -0
- data/db/default/spree/stock_locations.rb +2 -0
- data/db/default/spree/store_credit.rb +2 -0
- data/db/default/spree/stores.rb +2 -0
- data/db/default/spree/zones.rb +2 -0
- data/db/migrate/20160101010000_solidus_one_four.rb +175 -173
- data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb +3 -1
- data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb +2 -0
- data/db/migrate/20160924135758_remove_is_default_from_prices.rb +2 -0
- data/db/migrate/20161009141333_remove_currency_from_line_items.rb +2 -0
- data/db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb +2 -0
- data/db/migrate/20161017102621_create_spree_promotion_code_batch.rb +3 -1
- data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb +2 -0
- data/db/migrate/20161129035810_add_index_to_spree_payments_number.rb +2 -0
- data/db/migrate/20170223235001_remove_spree_store_credits_column.rb +2 -0
- data/db/migrate/20170317035819_add_lft_and_rgt_indexes_to_taxons.rb +2 -0
- data/db/migrate/20170319191942_remove_order_id_from_inventory_units.rb +2 -0
- data/db/migrate/20170412103617_transform_tax_rate_category_relation.rb +2 -0
- data/db/migrate/20170422134804_add_roles_unique_constraints.rb +2 -0
- data/db/migrate/20170522143442_add_time_range_to_tax_rate.rb +2 -0
- data/db/migrate/20170608074534_rename_bogus_gateways.rb +2 -0
- data/db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb +2 -0
- data/db/migrate/20180202190713_create_promotion_rule_stores.rb +12 -0
- data/db/migrate/20180202222641_create_store_shipping_methods.rb +12 -0
- data/db/migrate/20180313220213_add_available_locales_to_stores.rb +9 -0
- data/db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb +61 -0
- data/db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb +11 -0
- data/db/seeds.rb +1 -2
- data/lib/generators/spree/custom_user/custom_user_generator.rb +3 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +10 -7
- data/lib/generators/spree/dummy/templates/rails/{application.rb → application.rb.tt} +0 -0
- data/lib/generators/spree/install/install_generator.rb +18 -15
- data/lib/generators/spree/install/templates/config/initializers/{spree.rb → spree.rb.tt} +0 -0
- data/lib/solidus_core.rb +2 -0
- data/lib/spree/app_configuration.rb +8 -5
- data/lib/spree/config.rb +2 -0
- data/lib/spree/core.rb +3 -0
- data/lib/spree/core/active_merchant_dependencies.rb +2 -0
- data/lib/spree/core/class_constantizer.rb +2 -0
- data/lib/spree/core/controller_helpers/auth.rb +8 -3
- data/lib/spree/core/controller_helpers/common.rb +13 -4
- data/lib/spree/core/controller_helpers/order.rb +2 -0
- data/lib/spree/core/controller_helpers/payment_parameters.rb +2 -0
- data/lib/spree/core/controller_helpers/pricing.rb +2 -0
- data/lib/spree/core/controller_helpers/search.rb +2 -0
- data/lib/spree/core/controller_helpers/store.rb +2 -0
- data/lib/spree/core/controller_helpers/strong_parameters.rb +2 -0
- data/lib/spree/core/current_store.rb +2 -0
- data/lib/spree/core/engine.rb +2 -0
- data/lib/spree/core/environment.rb +2 -0
- data/lib/spree/core/environment/calculators.rb +2 -0
- data/lib/spree/core/environment_extension.rb +3 -1
- data/lib/spree/core/importer.rb +2 -0
- data/lib/spree/core/importer/order.rb +2 -0
- data/lib/spree/core/importer/product.rb +2 -0
- data/lib/spree/core/permalinks.rb +2 -0
- data/lib/spree/core/product_duplicator.rb +2 -0
- data/lib/spree/core/product_filters.rb +2 -0
- data/lib/spree/core/role_configuration.rb +3 -1
- data/lib/spree/core/search/base.rb +6 -0
- data/lib/spree/core/search/variant.rb +3 -1
- data/lib/spree/core/stock_configuration.rb +2 -0
- data/lib/spree/core/validators/email.rb +27 -4
- data/lib/spree/core/version.rb +3 -1
- data/lib/spree/deprecation.rb +2 -0
- data/lib/spree/i18n.rb +8 -0
- data/lib/spree/localized_number.rb +2 -0
- data/lib/spree/mailer_previews/carton_preview.rb +2 -0
- data/lib/spree/mailer_previews/order_preview.rb +2 -0
- data/lib/spree/mailer_previews/reimbursement_preview.rb +2 -0
- data/lib/spree/migration_helpers.rb +2 -0
- data/lib/spree/migrations.rb +2 -0
- data/lib/spree/money.rb +3 -3
- data/lib/spree/paranoia_deprecations.rb +2 -0
- data/lib/spree/permission_sets.rb +2 -0
- data/lib/spree/permission_sets/base.rb +2 -0
- data/lib/spree/permission_sets/configuration_display.rb +2 -0
- data/lib/spree/permission_sets/configuration_management.rb +2 -0
- data/lib/spree/permission_sets/dashboard_display.rb +2 -0
- data/lib/spree/permission_sets/default_customer.rb +2 -0
- data/lib/spree/permission_sets/order_display.rb +2 -0
- data/lib/spree/permission_sets/order_management.rb +2 -0
- data/lib/spree/permission_sets/product_display.rb +2 -0
- data/lib/spree/permission_sets/product_management.rb +2 -0
- data/lib/spree/permission_sets/promotion_display.rb +2 -0
- data/lib/spree/permission_sets/promotion_management.rb +2 -0
- data/lib/spree/permission_sets/report_display.rb +2 -0
- data/lib/spree/permission_sets/restricted_stock_display.rb +2 -0
- data/lib/spree/permission_sets/restricted_stock_management.rb +2 -0
- data/lib/spree/permission_sets/stock_display.rb +2 -0
- data/lib/spree/permission_sets/stock_management.rb +2 -0
- data/lib/spree/permission_sets/super_user.rb +2 -0
- data/lib/spree/permission_sets/user_display.rb +2 -0
- data/lib/spree/permission_sets/user_management.rb +2 -0
- data/lib/spree/permitted_attributes.rb +2 -0
- data/lib/spree/preferences/configuration.rb +2 -0
- data/lib/spree/preferences/preferable.rb +2 -0
- data/lib/spree/preferences/preferable_class_methods.rb +2 -0
- data/lib/spree/preferences/scoped_store.rb +2 -0
- data/lib/spree/preferences/static_model_preferences.rb +2 -0
- data/lib/spree/preferences/statically_configurable.rb +2 -0
- data/lib/spree/preferences/store.rb +2 -0
- data/lib/spree/promo/environment.rb +2 -0
- data/lib/spree/testing_support/ability_helpers.rb +2 -0
- data/lib/spree/testing_support/authorization_helpers.rb +2 -0
- data/lib/spree/testing_support/bar_ability.rb +5 -0
- data/lib/spree/testing_support/caching.rb +2 -16
- data/lib/spree/testing_support/capybara_ext.rb +114 -108
- data/lib/spree/testing_support/common_rake.rb +2 -0
- data/lib/spree/testing_support/controller_requests.rb +2 -0
- data/lib/spree/testing_support/dummy_app.rb +17 -8
- data/lib/spree/testing_support/dummy_app/database.yml +4 -1
- data/lib/spree/testing_support/dummy_app/migrations.rb +14 -2
- data/lib/spree/testing_support/dummy_app/rake_tasks.rb +8 -1
- data/lib/spree/testing_support/dummy_app/routes.rb +5 -0
- data/lib/spree/testing_support/extension_rake.rb +2 -0
- data/lib/spree/testing_support/factories.rb +2 -0
- data/lib/spree/testing_support/factories/address_factory.rb +14 -12
- data/lib/spree/testing_support/factories/adjustment_factory.rb +7 -5
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +2 -0
- data/lib/spree/testing_support/factories/calculator_factory.rb +7 -5
- data/lib/spree/testing_support/factories/carton_factory.rb +2 -0
- data/lib/spree/testing_support/factories/country_factory.rb +3 -1
- data/lib/spree/testing_support/factories/credit_card_factory.rb +7 -5
- data/lib/spree/testing_support/factories/customer_return_factory.rb +3 -1
- data/lib/spree/testing_support/factories/image_factory.rb +2 -0
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +4 -2
- data/lib/spree/testing_support/factories/line_item_factory.rb +4 -2
- data/lib/spree/testing_support/factories/option_type_factory.rb +3 -1
- data/lib/spree/testing_support/factories/option_value_factory.rb +3 -1
- data/lib/spree/testing_support/factories/order_factory.rb +15 -13
- data/lib/spree/testing_support/factories/order_promotion_factory.rb +2 -0
- data/lib/spree/testing_support/factories/payment_factory.rb +8 -6
- data/lib/spree/testing_support/factories/payment_method_factory.rb +17 -15
- data/lib/spree/testing_support/factories/price_factory.rb +4 -2
- data/lib/spree/testing_support/factories/product_factory.rb +8 -6
- data/lib/spree/testing_support/factories/product_option_type_factory.rb +2 -0
- data/lib/spree/testing_support/factories/product_property_factory.rb +2 -0
- data/lib/spree/testing_support/factories/promotion_category_factory.rb +3 -1
- data/lib/spree/testing_support/factories/promotion_code_factory.rb +2 -0
- data/lib/spree/testing_support/factories/promotion_factory.rb +7 -5
- data/lib/spree/testing_support/factories/property_factory.rb +4 -2
- data/lib/spree/testing_support/factories/refund_factory.rb +4 -2
- data/lib/spree/testing_support/factories/refund_reason_factory.rb +2 -0
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +3 -1
- data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +4 -2
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +3 -1
- data/lib/spree/testing_support/factories/return_item_factory.rb +2 -0
- data/lib/spree/testing_support/factories/return_reason_factory.rb +2 -0
- data/lib/spree/testing_support/factories/role_factory.rb +3 -1
- data/lib/spree/testing_support/factories/shipment_factory.rb +6 -4
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +2 -0
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +8 -6
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +2 -0
- data/lib/spree/testing_support/factories/state_factory.rb +4 -2
- data/lib/spree/testing_support/factories/stock_item_factory.rb +3 -1
- data/lib/spree/testing_support/factories/stock_location_factory.rb +10 -8
- data/lib/spree/testing_support/factories/stock_movement_factory.rb +5 -3
- data/lib/spree/testing_support/factories/stock_package_factory.rb +2 -0
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +3 -1
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +2 -0
- data/lib/spree/testing_support/factories/store_credit_factory.rb +4 -2
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +2 -0
- data/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb +3 -1
- data/lib/spree/testing_support/factories/store_factory.rb +3 -1
- data/lib/spree/testing_support/factories/tax_category_factory.rb +2 -0
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +3 -1
- data/lib/spree/testing_support/factories/taxon_factory.rb +4 -2
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +3 -1
- data/lib/spree/testing_support/factories/user_factory.rb +3 -1
- data/lib/spree/testing_support/factories/variant_factory.rb +9 -7
- data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +2 -0
- data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +3 -1
- data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +2 -0
- data/lib/spree/testing_support/factories/zone_factory.rb +3 -1
- data/lib/spree/testing_support/flash.rb +2 -0
- data/lib/spree/testing_support/order_walkthrough.rb +72 -63
- data/lib/spree/testing_support/preferences.rb +2 -0
- data/lib/spree/testing_support/sequences.rb +2 -0
- data/lib/spree/testing_support/url_helpers.rb +2 -0
- data/lib/spree_core.rb +2 -0
- data/lib/tasks/core.rake +4 -4
- data/lib/tasks/email.rake +2 -0
- data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake +2 -0
- data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake +2 -0
- data/lib/tasks/migrations/migrate_user_addresses.rake +2 -0
- data/lib/tasks/migrations/rename_gateways.rake +2 -0
- data/lib/tasks/order_capturing.rake +3 -1
- data/script/rails +4 -2
- data/solidus_core.gemspec +5 -4
- data/spec/helpers/base_helper_spec.rb +6 -0
- data/spec/helpers/products_helper_spec.rb +1 -1
- data/spec/helpers/taxons_helper_spec.rb +2 -0
- data/spec/jobs/promotion_code_batch_job_spec.rb +32 -1
- data/spec/lib/calculated_adjustments_spec.rb +3 -1
- data/spec/lib/i18n_spec.rb +47 -0
- data/spec/lib/search/base_spec.rb +2 -0
- data/spec/lib/search/variant_spec.rb +2 -0
- data/spec/lib/spree/core/class_constantizer_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/auth_spec.rb +3 -0
- data/spec/lib/spree/core/controller_helpers/order_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/pricing_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/search_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/store_spec.rb +2 -0
- data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb +2 -0
- data/spec/lib/spree/core/current_store_spec.rb +2 -0
- data/spec/lib/spree/core/environment_extension_spec.rb +2 -0
- data/spec/lib/spree/core/importer/order_spec.rb +20 -8
- data/spec/lib/spree/core/role_configuration_spec.rb +2 -0
- data/spec/lib/spree/core/stock_configuration_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_credit_update_reason_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb +2 -0
- data/spec/lib/spree/core/testing_support/preferences_spec.rb +2 -0
- data/spec/lib/spree/core/validators/email_spec.rb +4 -2
- data/spec/lib/spree/core/version_spec.rb +2 -0
- data/spec/lib/spree/localized_number_spec.rb +2 -0
- data/spec/lib/spree/migrations_spec.rb +2 -0
- data/spec/lib/spree/money_spec.rb +1 -1
- data/spec/lib/spree/permission_sets/default_customer_spec.rb +2 -0
- data/spec/lib/tasks/dummy_task.rake +2 -0
- data/spec/lib/tasks/dummy_task_spec.rb +2 -0
- data/spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb +2 -0
- data/spec/mailers/carton_mailer_spec.rb +2 -0
- data/spec/mailers/order_mailer_spec.rb +2 -0
- data/spec/mailers/promotion_code_batch_mailer_spec.rb +2 -0
- data/spec/mailers/reimbursement_mailer_spec.rb +2 -0
- data/spec/mailers/test_mailer_spec.rb +2 -0
- data/spec/models/spree/ability_spec.rb +6 -1
- data/spec/models/spree/address_spec.rb +3 -1
- data/spec/models/spree/adjustment_reason_spec.rb +2 -0
- data/spec/models/spree/adjustment_spec.rb +1 -2
- data/spec/models/spree/app_configuration_spec.rb +2 -0
- data/spec/models/spree/asset_spec.rb +2 -0
- data/spec/models/spree/calculator/default_tax_spec.rb +2 -0
- data/spec/models/spree/calculator/distributed_amount_spec.rb +50 -0
- data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +2 -0
- data/spec/models/spree/calculator/flat_rate_spec.rb +2 -0
- data/spec/models/spree/calculator/flexi_rate_spec.rb +3 -1
- data/spec/models/spree/calculator/free_shipping_spec.rb +2 -0
- data/spec/models/spree/calculator/percent_on_line_item_spec.rb +2 -0
- data/spec/models/spree/calculator/percent_per_item_spec.rb +2 -0
- data/spec/models/spree/calculator/price_sack_spec.rb +2 -0
- data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +2 -0
- data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +2 -0
- data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +2 -0
- data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +2 -0
- data/spec/models/spree/calculator/shipping/per_item_spec.rb +2 -0
- data/spec/models/spree/calculator/shipping/price_sack_spec.rb +2 -0
- data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +2 -0
- data/spec/models/spree/calculator/tiered_percent_spec.rb +2 -0
- data/spec/models/spree/calculator_spec.rb +2 -0
- data/spec/models/spree/carton_spec.rb +2 -0
- data/spec/models/spree/classification_spec.rb +2 -0
- data/spec/models/spree/concerns/display_money_spec.rb +2 -0
- data/spec/models/spree/concerns/ordered_property_value_list_spec.rb +2 -0
- data/spec/models/spree/concerns/user_address_book_spec.rb +2 -0
- data/spec/models/spree/concerns/user_methods_spec.rb +2 -0
- data/spec/models/spree/country_spec.rb +2 -0
- data/spec/models/spree/credit_card_spec.rb +3 -2
- data/spec/models/spree/customer_return_spec.rb +3 -1
- data/spec/models/spree/distributed_amounts_handler_spec.rb +19 -15
- data/spec/models/spree/exchange_spec.rb +2 -0
- data/spec/models/spree/fulfilment_changer_spec.rb +2 -0
- data/spec/models/spree/gateway/bogus_simple.rb +2 -0
- data/spec/models/spree/gateway/bogus_spec.rb +2 -0
- data/spec/models/spree/gateway_spec.rb +2 -0
- data/spec/models/spree/image_spec.rb +2 -0
- data/spec/models/spree/inventory_unit_spec.rb +2 -0
- data/spec/models/spree/line_item_spec.rb +2 -0
- data/spec/models/spree/option_type_spec.rb +2 -0
- data/spec/models/spree/option_value_spec.rb +2 -0
- data/spec/models/spree/order/address_spec.rb +2 -0
- data/spec/models/spree/order/adjustments_spec.rb +2 -0
- data/spec/models/spree/order/callbacks_spec.rb +2 -0
- data/spec/models/spree/order/checkout_spec.rb +2 -0
- data/spec/models/spree/order/finalizing_spec.rb +2 -0
- data/spec/models/spree/order/number_generator_spec.rb +2 -0
- data/spec/models/spree/order/outstanding_balance_integration_spec.rb +2 -0
- data/spec/models/spree/order/payment_spec.rb +2 -0
- data/spec/models/spree/order/risk_assessment_spec.rb +2 -0
- data/spec/models/spree/order/state_machine_spec.rb +2 -0
- data/spec/models/spree/order/totals_spec.rb +2 -0
- data/spec/models/spree/order/updating_spec.rb +2 -0
- data/spec/models/spree/order/validations_spec.rb +2 -0
- data/spec/models/spree/order_cancellations_spec.rb +2 -0
- data/spec/models/spree/order_capturing_spec.rb +2 -0
- data/spec/models/spree/order_contents_spec.rb +2 -0
- data/spec/models/spree/order_inventory_spec.rb +2 -1
- data/spec/models/spree/order_merger_spec.rb +2 -0
- data/spec/models/spree/order_mutex_spec.rb +2 -0
- data/spec/models/spree/order_promotion_spec.rb +2 -0
- data/spec/models/spree/order_shipping_spec.rb +2 -0
- data/spec/models/spree/order_spec.rb +17 -12
- data/spec/models/spree/order_taxation_spec.rb +2 -0
- data/spec/models/spree/order_update_attributes_spec.rb +2 -0
- data/spec/models/spree/order_updater_spec.rb +2 -0
- data/spec/models/spree/payment/cancellation_spec.rb +2 -0
- data/spec/models/spree/payment_create_spec.rb +2 -0
- data/spec/models/spree/payment_method/bogus_credit_card_spec.rb +2 -0
- data/spec/models/spree/payment_method/check_spec.rb +2 -0
- data/spec/models/spree/payment_method/credit_card_spec.rb +2 -0
- data/spec/models/spree/payment_method/simple_bogus_credit_card_spec.rb +2 -0
- data/spec/models/spree/payment_method/store_credit_spec.rb +2 -0
- data/spec/models/spree/payment_method_spec.rb +58 -23
- data/spec/models/spree/payment_spec.rb +2 -0
- data/spec/models/spree/permission_sets/base_spec.rb +2 -0
- data/spec/models/spree/permission_sets/configuration_display.rb +2 -0
- data/spec/models/spree/permission_sets/configuration_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/dashboard_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/order_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/order_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/product_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/product_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/promotion_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/promotion_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/report_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/restricted_stock_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/restricted_stock_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/stock_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/stock_management_spec.rb +2 -0
- data/spec/models/spree/permission_sets/user_display_spec.rb +2 -0
- data/spec/models/spree/permission_sets/user_management_spec.rb +2 -0
- data/spec/models/spree/preference_spec.rb +2 -0
- data/spec/models/spree/preferences/configuration_spec.rb +2 -0
- data/spec/models/spree/preferences/preferable_spec.rb +2 -0
- data/spec/models/spree/preferences/scoped_store_spec.rb +2 -0
- data/spec/models/spree/preferences/static_model_preferences_spec.rb +2 -0
- data/spec/models/spree/preferences/statically_configurable_spec.rb +2 -0
- data/spec/models/spree/preferences/store_spec.rb +2 -0
- data/spec/models/spree/price_spec.rb +2 -0
- data/spec/models/spree/product/scopes_spec.rb +2 -0
- data/spec/models/spree/product_duplicator_spec.rb +3 -1
- data/spec/models/spree/product_filter_spec.rb +2 -0
- data/spec/models/spree/product_property_spec.rb +2 -0
- data/spec/models/spree/product_spec.rb +12 -2
- data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +2 -0
- data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +2 -0
- data/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb +3 -1
- data/spec/models/spree/promotion/actions/free_shipping_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/first_order_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/item_total_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/nth_order_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/option_value_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/product_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/store_spec.rb +35 -0
- data/spec/models/spree/promotion/rules/taxon_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/user_role_spec.rb +2 -0
- data/spec/models/spree/promotion/rules/user_spec.rb +2 -0
- data/spec/models/spree/promotion_action_spec.rb +2 -0
- data/spec/models/spree/promotion_category_spec.rb +2 -0
- data/spec/models/spree/promotion_code/batch_builder_spec.rb +30 -6
- data/spec/models/spree/promotion_code_batch_spec.rb +2 -0
- data/spec/models/spree/promotion_code_spec.rb +2 -0
- data/spec/models/spree/promotion_handler/cart_spec.rb +2 -0
- data/spec/models/spree/promotion_handler/coupon_spec.rb +4 -2
- data/spec/models/spree/promotion_handler/page_spec.rb +2 -0
- data/spec/models/spree/promotion_handler/shipping_spec.rb +2 -0
- data/spec/models/spree/promotion_rule_spec.rb +2 -0
- data/spec/models/spree/promotion_spec.rb +4 -2
- data/spec/models/spree/refund_spec.rb +2 -0
- data/spec/models/spree/reimbursement/credit_spec.rb +2 -0
- data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +2 -0
- data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +2 -0
- data/spec/models/spree/reimbursement_performer_spec.rb +2 -0
- data/spec/models/spree/reimbursement_spec.rb +2 -0
- data/spec/models/spree/reimbursement_tax_calculator_spec.rb +2 -0
- data/spec/models/spree/reimbursement_type/credit_spec.rb +2 -0
- data/spec/models/spree/reimbursement_type/exchange_spec.rb +2 -0
- data/spec/models/spree/reimbursement_type/original_payment_spec.rb +2 -0
- data/spec/models/spree/reimbursement_type/store_credit_spec.rb +2 -0
- data/spec/models/spree/return_authorization_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +2 -0
- data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +22 -15
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +2 -0
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +2 -0
- data/spec/models/spree/return_item_spec.rb +2 -0
- data/spec/models/spree/returns_calculator_spec.rb +2 -0
- data/spec/models/spree/shipment_spec.rb +45 -4
- data/spec/models/spree/shipping_calculator_spec.rb +2 -0
- data/spec/models/spree/shipping_manifest_spec.rb +2 -0
- data/spec/models/spree/shipping_method_spec.rb +2 -0
- data/spec/models/spree/shipping_rate_spec.rb +1 -1
- data/spec/models/spree/shipping_rate_tax_spec.rb +2 -0
- data/spec/models/spree/state_spec.rb +2 -0
- data/spec/models/spree/stock/availability_spec.rb +2 -0
- data/spec/models/spree/stock/availability_validator_spec.rb +2 -0
- data/spec/models/spree/stock/differentiator_spec.rb +2 -0
- data/spec/models/spree/stock/estimator_spec.rb +31 -1
- data/spec/models/spree/stock/inventory_unit_builder_spec.rb +2 -0
- data/spec/models/spree/stock/package_spec.rb +2 -0
- data/spec/models/spree/stock/quantifier_spec.rb +2 -0
- data/spec/models/spree/stock/shipping_rate_selector_spec.rb +2 -0
- data/spec/models/spree/stock/shipping_rate_sorter_spec.rb +2 -0
- data/spec/models/spree/stock/simple_coordinator_spec.rb +2 -0
- data/spec/models/spree/stock/splitter/backordered_spec.rb +2 -0
- data/spec/models/spree/stock/splitter/base_spec.rb +2 -0
- data/spec/models/spree/stock/splitter/shipping_category_spec.rb +2 -0
- data/spec/models/spree/stock/splitter/weight_spec.rb +2 -0
- data/spec/models/spree/stock/splitter_chain_spec.rb +2 -0
- data/spec/models/spree/stock_item_spec.rb +2 -0
- data/spec/models/spree/stock_location_spec.rb +2 -0
- data/spec/models/spree/stock_movement_spec.rb +2 -0
- data/spec/models/spree/stock_quantities_spec.rb +2 -0
- data/spec/models/spree/store_credit_category_spec.rb +2 -0
- data/spec/models/spree/store_credit_event_spec.rb +17 -1
- data/spec/models/spree/store_credit_spec.rb +22 -5
- data/spec/models/spree/store_selector/by_server_name_spec.rb +2 -0
- data/spec/models/spree/store_selector/legacy_spec.rb +2 -0
- data/spec/models/spree/store_spec.rb +59 -0
- data/spec/models/spree/tax/order_adjuster_spec.rb +2 -0
- data/spec/models/spree/tax/shipping_rate_taxer_spec.rb +2 -0
- data/spec/models/spree/tax/tax_location_spec.rb +2 -0
- data/spec/models/spree/tax/taxation_integration_spec.rb +2 -0
- data/spec/models/spree/tax_calculator/default_spec.rb +2 -0
- data/spec/models/spree/tax_category_spec.rb +2 -0
- data/spec/models/spree/tax_rate_spec.rb +5 -4
- data/spec/models/spree/taxon_spec.rb +9 -1
- data/spec/models/spree/taxonomy_spec.rb +5 -7
- data/spec/models/spree/unit_cancel_spec.rb +2 -0
- data/spec/models/spree/user_spec.rb +2 -0
- data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +2 -0
- data/spec/models/spree/variant/price_selector_spec.rb +2 -0
- data/spec/models/spree/variant/pricing_options_spec.rb +2 -0
- data/spec/models/spree/variant/scopes_spec.rb +16 -0
- data/spec/models/spree/variant/vat_price_generator_spec.rb +2 -0
- data/spec/models/spree/variant_property_rule_condition_spec.rb +2 -0
- data/spec/models/spree/variant_property_rule_spec.rb +2 -0
- data/spec/models/spree/variant_property_rule_value_spec.rb +2 -0
- data/spec/models/spree/variant_spec.rb +2 -2
- data/spec/models/spree/wallet_payment_source_spec.rb +2 -0
- data/spec/models/spree/wallet_spec.rb +2 -0
- data/spec/models/spree/zone_spec.rb +2 -0
- data/spec/rails_helper.rb +4 -2
- data/spec/shared_examples/calculator_shared_examples.rb +2 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/support/big_decimal.rb +2 -0
- data/spec/support/concerns/default_price.rb +2 -0
- data/spec/support/concerns/payment_source.rb +2 -0
- data/spec/support/concerns/working_factories.rb +2 -0
- data/spec/support/dummy_ability.rb +2 -0
- data/spec/support/shared_contexts/rake.rb +2 -0
- metadata +114 -54
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'rails_helper'
|
2
4
|
|
3
5
|
RSpec.describe Spree::OrderInventory, type: :model do
|
@@ -7,7 +9,6 @@ RSpec.describe Spree::OrderInventory, type: :model do
|
|
7
9
|
let(:variant) { subject.variant }
|
8
10
|
let(:stock_item) { shipment.stock_location.stock_item(variant) }
|
9
11
|
|
10
|
-
|
11
12
|
subject { described_class.new(order, line_item) }
|
12
13
|
|
13
14
|
context "insufficient inventory units" do
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'rails_helper'
|
2
4
|
|
3
5
|
RSpec.describe Spree::Order, type: :model do
|
@@ -377,13 +379,13 @@ RSpec.describe Spree::Order, type: :model do
|
|
377
379
|
|
378
380
|
it "does nothing if any shipments are ready" do
|
379
381
|
shipment = create(:shipment, order: subject, state: "ready")
|
380
|
-
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments
|
382
|
+
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
|
381
383
|
expect { shipment.reload }.not_to raise_error
|
382
384
|
end
|
383
385
|
|
384
386
|
it "does nothing if any shipments are shipped" do
|
385
387
|
shipment = create(:shipment, order: subject, state: "shipped")
|
386
|
-
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments
|
388
|
+
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
|
387
389
|
expect { shipment.reload }.not_to raise_error
|
388
390
|
end
|
389
391
|
end
|
@@ -604,10 +606,14 @@ RSpec.describe Spree::Order, type: :model do
|
|
604
606
|
context "with more than one payment method" do
|
605
607
|
subject { order.available_payment_methods }
|
606
608
|
|
607
|
-
let!(:first_method) {
|
608
|
-
|
609
|
-
|
610
|
-
|
609
|
+
let!(:first_method) {
|
610
|
+
FactoryBot.create(:payment_method, available_to_users: true,
|
611
|
+
available_to_admin: true)
|
612
|
+
}
|
613
|
+
let!(:second_method) {
|
614
|
+
FactoryBot.create(:payment_method, available_to_users: true,
|
615
|
+
available_to_admin: true)
|
616
|
+
}
|
611
617
|
|
612
618
|
before do
|
613
619
|
second_method.move_to_top
|
@@ -623,8 +629,7 @@ RSpec.describe Spree::Order, type: :model do
|
|
623
629
|
|
624
630
|
let!(:store_with_payment_methods) do
|
625
631
|
create(:store,
|
626
|
-
payment_methods: [payment_method_with_store]
|
627
|
-
)
|
632
|
+
payment_methods: [payment_method_with_store])
|
628
633
|
end
|
629
634
|
let!(:payment_method_with_store) { create(:payment_method) }
|
630
635
|
let!(:store_without_payment_methods) { create(:store) }
|
@@ -640,7 +645,8 @@ RSpec.describe Spree::Order, type: :model do
|
|
640
645
|
end
|
641
646
|
|
642
647
|
context 'and the store has an extra payment method unavailable to users' do
|
643
|
-
let!(:admin_only_payment_method) do
|
648
|
+
let!(:admin_only_payment_method) do
|
649
|
+
create(:payment_method,
|
644
650
|
available_to_users: false,
|
645
651
|
available_to_admin: true)
|
646
652
|
end
|
@@ -1096,12 +1102,11 @@ RSpec.describe Spree::Order, type: :model do
|
|
1096
1102
|
|
1097
1103
|
it "raises an error if any shipments are ready" do
|
1098
1104
|
shipment = create(:shipment, order: subject, state: "ready")
|
1099
|
-
|
1100
1105
|
expect {
|
1101
1106
|
expect {
|
1102
1107
|
subject.create_proposed_shipments
|
1103
1108
|
}.to raise_error(Spree::Order::CannotRebuildShipments)
|
1104
|
-
}.not_to change { subject.reload.shipments
|
1109
|
+
}.not_to change { subject.reload.shipments }
|
1105
1110
|
|
1106
1111
|
expect { shipment.reload }.not_to raise_error
|
1107
1112
|
end
|
@@ -1112,7 +1117,7 @@ RSpec.describe Spree::Order, type: :model do
|
|
1112
1117
|
expect {
|
1113
1118
|
subject.create_proposed_shipments
|
1114
1119
|
}.to raise_error(Spree::Order::CannotRebuildShipments)
|
1115
|
-
}.not_to change { subject.reload.shipments
|
1120
|
+
}.not_to change { subject.reload.shipments }
|
1116
1121
|
|
1117
1122
|
expect { shipment.reload }.not_to raise_error
|
1118
1123
|
end
|
@@ -1,18 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'rails_helper'
|
2
4
|
|
3
5
|
RSpec.describe Spree::PaymentMethod, type: :model do
|
4
|
-
let!(:payment_method_nil_display)
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
6
|
+
let!(:payment_method_nil_display) do
|
7
|
+
create(:payment_method, {
|
8
|
+
active: true,
|
9
|
+
available_to_users: true,
|
10
|
+
available_to_admin: true
|
11
|
+
})
|
12
|
+
end
|
13
|
+
let!(:payment_method_both_display) do
|
14
|
+
create(:payment_method, {
|
15
|
+
active: true,
|
16
|
+
available_to_users: true,
|
17
|
+
available_to_admin: true
|
18
|
+
})
|
19
|
+
end
|
20
|
+
let!(:payment_method_front_display) do
|
21
|
+
create(:payment_method, {
|
22
|
+
active: true,
|
23
|
+
available_to_users: true,
|
24
|
+
available_to_admin: false
|
25
|
+
})
|
26
|
+
end
|
27
|
+
let!(:payment_method_back_display) do
|
28
|
+
create(:payment_method, {
|
29
|
+
active: true,
|
30
|
+
available_to_users: false,
|
31
|
+
available_to_admin: true
|
32
|
+
})
|
33
|
+
end
|
16
34
|
|
17
35
|
describe "available_to_[<users>, <admin>, <store>]" do
|
18
36
|
context "when searching for payment methods available to users and admins" do
|
@@ -21,14 +39,20 @@ RSpec.describe Spree::PaymentMethod, type: :model do
|
|
21
39
|
it { is_expected.to contain_exactly(payment_method_both_display, payment_method_nil_display) }
|
22
40
|
|
23
41
|
context "with a store" do
|
24
|
-
let!(:extra_payment_method_both_display)
|
25
|
-
|
26
|
-
|
42
|
+
let!(:extra_payment_method_both_display) do
|
43
|
+
create(:payment_method, {
|
44
|
+
active: true,
|
45
|
+
available_to_users: true,
|
46
|
+
available_to_admin: true
|
47
|
+
})
|
48
|
+
end
|
27
49
|
let!(:store_1) do
|
28
|
-
create(:store, payment_methods:[
|
29
|
-
|
30
|
-
|
31
|
-
|
50
|
+
create(:store, payment_methods: [
|
51
|
+
payment_method_nil_display,
|
52
|
+
payment_method_both_display,
|
53
|
+
payment_method_front_display,
|
54
|
+
payment_method_back_display
|
55
|
+
])
|
32
56
|
end
|
33
57
|
|
34
58
|
subject { Spree::PaymentMethod.available_to_store( store_1 ).available_to_users.available_to_admin }
|
@@ -38,7 +62,7 @@ RSpec.describe Spree::PaymentMethod, type: :model do
|
|
38
62
|
context "when the store has no payment methods" do
|
39
63
|
subject { Spree::PaymentMethod.available_to_store(store_without_payment_methods) }
|
40
64
|
let!(:store_without_payment_methods) do
|
41
|
-
create(:store, payment_methods:[])
|
65
|
+
create(:store, payment_methods: [])
|
42
66
|
end
|
43
67
|
|
44
68
|
it "returns all payment methods" do
|
@@ -65,7 +89,7 @@ RSpec.describe Spree::PaymentMethod, type: :model do
|
|
65
89
|
context "when searching for payment methods available to admin" do
|
66
90
|
subject { Spree::PaymentMethod.available_to_admin }
|
67
91
|
|
68
|
-
it { is_expected.to contain_exactly(payment_method_back_display, payment_method_both_display, payment_method_nil_display)}
|
92
|
+
it { is_expected.to contain_exactly(payment_method_back_display, payment_method_both_display, payment_method_nil_display) }
|
69
93
|
end
|
70
94
|
|
71
95
|
context "when searching for payment methods available to a store" do
|
@@ -122,8 +146,7 @@ RSpec.describe Spree::PaymentMethod, type: :model do
|
|
122
146
|
payment_method_both_display,
|
123
147
|
payment_method_front_display,
|
124
148
|
payment_method_back_display
|
125
|
-
]
|
126
|
-
)
|
149
|
+
])
|
127
150
|
end
|
128
151
|
|
129
152
|
let!(:store_2) do
|
@@ -370,4 +393,16 @@ RSpec.describe Spree::PaymentMethod, type: :model do
|
|
370
393
|
end
|
371
394
|
end
|
372
395
|
end
|
396
|
+
|
397
|
+
describe "::DISPLAY" do
|
398
|
+
it "returns [:both, :front_end, :back_end]" do
|
399
|
+
# Emits deprecation warning on first reference
|
400
|
+
Spree::Deprecation.silence do
|
401
|
+
expect(Spree::PaymentMethod::DISPLAY).to eq([:both, :front_end, :back_end])
|
402
|
+
end
|
403
|
+
|
404
|
+
# but not subsequent
|
405
|
+
expect(Spree::PaymentMethod::DISPLAY).to eq([:both, :front_end, :back_end])
|
406
|
+
end
|
407
|
+
end
|
373
408
|
end
|