mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-02 02:11:33 +00:00
UNSAFE Style Rails/CompactBlank
This commit is contained in:
@@ -126,7 +126,7 @@ module Spree
|
||||
end
|
||||
|
||||
def address_and_city
|
||||
[address1, address2, city].select(&:present?).join(' ')
|
||||
[address1, address2, city].compact_blank.join(' ')
|
||||
end
|
||||
|
||||
private
|
||||
@@ -176,7 +176,7 @@ module Spree
|
||||
end
|
||||
|
||||
def render_address(parts)
|
||||
parts.select(&:present?).join(', ')
|
||||
parts.compact_blank.join(', ')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -18,7 +18,7 @@ class AddressGeocoder
|
||||
attr_reader :address
|
||||
|
||||
def geocode_address
|
||||
address_parts.select(&:present?).join(', ')
|
||||
address_parts.compact_blank.join(', ')
|
||||
end
|
||||
|
||||
def address_parts
|
||||
|
||||
@@ -37,7 +37,7 @@ module Reporting
|
||||
order.line_items[0].variant.product.update(name: "Cucumber")
|
||||
order.line_items[1].variant.product.update(name: "Apple")
|
||||
order.line_items[2].variant.product.update(name: "Banane")
|
||||
product_names = report.rows.map(&:product).filter(&:present?)
|
||||
product_names = report.rows.map(&:product).compact_blank
|
||||
expect(product_names).to eq(["Apple", "Banane", "Cucumber"])
|
||||
end
|
||||
end
|
||||
@@ -84,7 +84,7 @@ module Reporting
|
||||
order.line_items[0].variant.product.update(name: "Cucumber")
|
||||
order.line_items[1].variant.product.update(name: "Apple")
|
||||
order.line_items[2].variant.product.update(name: "Banane")
|
||||
product_names = report.rows.map(&:product).filter(&:present?)
|
||||
product_names = report.rows.map(&:product).compact_blank
|
||||
# only the supplier's variant is displayed
|
||||
expect(product_names).to include("Cucumber")
|
||||
expect(product_names).not_to include("Apple", "Banane")
|
||||
|
||||
Reference in New Issue
Block a user