Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing mark default billing address #3634

Merged
merged 1 commit into from
May 27, 2020
Merged

Fixing mark default billing address #3634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/app/models/concerns/spree/user_address_book.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def mark_default_ship_address(address)
end

def mark_default_bill_address(address)
user_addresses.mark_default(user_addresses.find_by(address: address), :billing)
user_addresses.mark_default(user_addresses.find_by(address: address), address_type: :billing)
end

def remove_from_address_book(address_id)
Expand Down
33 changes: 9 additions & 24 deletions core/spec/models/spree/concerns/user_address_book_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,36 +584,21 @@ module Spree
end

describe "#mark_default_ship_address" do
let(:address) { build :address }
let(:user_address) { double }
let(:user_addresses) { double }

before do
allow(user).to receive(:user_addresses).and_return user_addresses
allow(user_addresses).to receive(:find_by).and_return user_address
end

it "calls #mark_default with default address kind" do
expect(user_addresses).to receive(:mark_default).with(user_address)
let(:user_address) { user.user_addresses.create(address: build(:address), default: false) }

user.mark_default_ship_address(address)
it "marks address specified as default shipping" do
user.mark_default_ship_address(user_address.address)
expect(user_address.reload.default).to be_truthy
end
end

describe "#mark_default_bill_address" do
let(:address) { build :address }
let(:user_address) { double }
let(:user_addresses) { double }

before do
allow(user).to receive(:user_addresses).and_return user_addresses
allow(user_addresses).to receive(:find_by).and_return user_address
end

it "calls #mark_default with billing address kind" do
expect(user_addresses).to receive(:mark_default).with(user_address, :billing)
let(:user) { create(:user_with_addresses) }
let(:user_address) { user.user_addresses.find_by(default_billing: false) }

user.mark_default_bill_address(address)
it "marks address specified as default billing" do
user.mark_default_bill_address(user_address.address)
expect(user_address.reload.default_billing).to be_truthy
end
end
end
Expand Down