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

Jump to bottom

Bug 12939 #12940

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Bug 12939 #12940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d75aa4
spec
dacook Oct 23, 2024
45ca296
Avoid crash
dacook Oct 23, 2024
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
4 changes: 3 additions & 1 deletion app/services/variant_units/option_value_namer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ def option_value_value_unit
value, unit_name = option_value_value_unit_scaled
else
value = @nameable.unit_value
unit_name = pluralize(@nameable.variant_unit_name, value)

unit_name = @nameable.variant_unit_name
unit_name = pluralize(unit_name, value) if unit_name.present?
end

value = value.to_i if value == value.to_i
Expand Down
8 changes: 8 additions & 0 deletions spec/services/variant_units/option_value_namer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ module VariantUnits
end
end

it "don't crash when variant_unit_name is nil" do
v = instance_double(Spree::Variant, variant_unit: 'items', variant_unit_scale: nil,
variant_unit_name: nil, unit_value: 100)

option_value_namer = OptionValueNamer.new v
expect(option_value_namer.__send__(:option_value_value_unit)).to eq [100, nil]
end

it "generates singular values for item units when value is 1" do
v = instance_double(Spree::Variant, variant_unit: 'items', variant_unit_scale: nil,
variant_unit_name: 'packet', unit_value: 1)
Expand Down
Loading