From 95de78f24e84df31777f31799d9486b08a95c1d8 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Mon, 17 Jun 2013 10:03:00 +1000 Subject: [PATCH] Tidy-ups --- app/models/spree/order_populator_decorator.rb | 2 +- spec/features/consumer/add_to_cart_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb index 953492297b..1fe6f166bb 100644 --- a/app/models/spree/order_populator_decorator.rb +++ b/app/models/spree/order_populator_decorator.rb @@ -16,7 +16,7 @@ Spree::OrderPopulator.class_eval do populate_without_distribution_validation(from_hash) if valid? - # Undo distribution setting if validation falied when adding a product + # Undo distribution setting if validation failed when adding a product if !valid? && cart_distribution_set set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle end diff --git a/spec/features/consumer/add_to_cart_spec.rb b/spec/features/consumer/add_to_cart_spec.rb index 60c64e9a4f..44d4ed162c 100644 --- a/spec/features/consumer/add_to_cart_spec.rb +++ b/spec/features/consumer/add_to_cart_spec.rb @@ -182,7 +182,7 @@ feature %q{ Spree::Order.last.line_items.should be_empty end - scenario "adding the first product to the cart", js: true do + scenario "adding the first product to the cart" do # Given a product and a distributor d = create(:distributor_enterprise) p = create(:product, :price => 12.34)