mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-09 23:06:06 +00:00
do not require phone number on orders
This commit is contained in:
committed by
Jean-Baptiste Bellet
parent
748a37f670
commit
69ec17ef92
@@ -12,7 +12,6 @@ module Spree
|
||||
|
||||
validates :firstname, :lastname, :address1, :city, :country, presence: true
|
||||
validates :zipcode, presence: true, if: :require_zipcode?
|
||||
validates :phone, presence: true, if: :require_phone?
|
||||
|
||||
validate :state_validate
|
||||
|
||||
@@ -101,10 +100,6 @@ module Spree
|
||||
|
||||
private
|
||||
|
||||
def require_phone?
|
||||
true
|
||||
end
|
||||
|
||||
def require_zipcode?
|
||||
true
|
||||
end
|
||||
|
||||
@@ -110,10 +110,10 @@ describe Spree::Address do
|
||||
expect(address).to be_valid
|
||||
end
|
||||
|
||||
it "requires phone" do
|
||||
it "does not require phone" do
|
||||
address.phone = ""
|
||||
address.valid?
|
||||
expect(address.errors["phone"]).to eq ["can't be blank"]
|
||||
expect(address.errors[:phone]).to be_empty
|
||||
end
|
||||
|
||||
it "requires zipcode" do
|
||||
@@ -122,16 +122,6 @@ describe Spree::Address do
|
||||
expect(address.errors[:zipcode].first).to eq "can't be blank"
|
||||
end
|
||||
|
||||
context "phone not required" do
|
||||
before { allow(address).to receive(:require_phone?) { false } }
|
||||
|
||||
it "shows no errors when phone is blank" do
|
||||
address.phone = ""
|
||||
address.valid?
|
||||
expect(address.errors[:phone]).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context "zipcode not required" do
|
||||
before { allow(address).to receive(:require_zipcode?) { false } }
|
||||
|
||||
@@ -197,9 +187,4 @@ describe Spree::Address do
|
||||
specify { expect(address.state_text).to eq 'virginia' }
|
||||
end
|
||||
end
|
||||
|
||||
context "defines require_phone? helper method" do
|
||||
let(:address) { build(:address) }
|
||||
specify { expect(address.instance_eval{ require_phone? }).to be_truthy }
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user