From c835b4eb1a9b7470651a48f37d3bb6ef2b4d538f Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 5 Apr 2017 12:18:38 +1000 Subject: [PATCH] Replacing stub_model objects with actual factory generated instances --- lib/spree/api/testing_support/helpers_decorator.rb | 2 +- lib/spree/api/testing_support/setup.rb | 4 ++-- spec/models/enterprise_fee_spec.rb | 2 +- spec/models/spree/calculator/price_sack_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spree/api/testing_support/helpers_decorator.rb b/lib/spree/api/testing_support/helpers_decorator.rb index 0ade798960..6f74490301 100644 --- a/lib/spree/api/testing_support/helpers_decorator.rb +++ b/lib/spree/api/testing_support/helpers_decorator.rb @@ -2,6 +2,6 @@ require 'spree/api/testing_support/helpers' Spree::Api::TestingSupport::Helpers.class_eval do def current_api_user - @current_api_user ||= stub_model(Spree::LegacyUser, :email => "spree@example.com", :enterprises => []) + @current_api_user ||= Spree::LegacyUser.new(:email => "spree@example.com", :enterprises => []) end end diff --git a/lib/spree/api/testing_support/setup.rb b/lib/spree/api/testing_support/setup.rb index 5b63168999..b8ffcd50f9 100644 --- a/lib/spree/api/testing_support/setup.rb +++ b/lib/spree/api/testing_support/setup.rb @@ -4,7 +4,7 @@ module Spree module Setup def sign_in_as_user! let!(:current_api_user) do - user = stub_model(Spree::LegacyUser) + user = Spree::LegacyUser.new(:email => "spree@example.com") user.stub(:has_spree_role?).with("admin").and_return(false) user.stub(:enterprises) { [] } user.stub(:owned_groups) { [] } @@ -28,7 +28,7 @@ module Spree def sign_in_as_admin! let!(:current_api_user) do - user = stub_model(Spree::LegacyUser) + user = Spree::LegacyUser.new(:email => "spree@example.com") user.stub(:has_spree_role?).with("admin").and_return(true) # Stub enterprises, needed for cancan ability checks diff --git a/spec/models/enterprise_fee_spec.rb b/spec/models/enterprise_fee_spec.rb index 6c4245c875..ee3512c5d2 100644 --- a/spec/models/enterprise_fee_spec.rb +++ b/spec/models/enterprise_fee_spec.rb @@ -166,7 +166,7 @@ describe EnterpriseFee do it "does not clear adjustments from another originator" do order = create(:order) - tax_rate = create(:tax_rate, calculator: stub_model(Spree::Calculator)) + tax_rate = create(:tax_rate, calculator: build(:calculator)) order.adjustments.create({:amount => 12.34, :source => order, :originator => tax_rate, diff --git a/spec/models/spree/calculator/price_sack_spec.rb b/spec/models/spree/calculator/price_sack_spec.rb index b34771c720..627e21589b 100644 --- a/spec/models/spree/calculator/price_sack_spec.rb +++ b/spec/models/spree/calculator/price_sack_spec.rb @@ -9,7 +9,7 @@ describe Spree::Calculator::PriceSack do calculator end - let(:line_item) { stub_model(Spree::LineItem, price: 1, quantity: 2) } + let(:line_item) { build(:line_item, price: 1, quantity: 2) } it "computes with a line item object" do calculator.compute(line_item)