rename variables; add test for the function getSettingWithCoercion

gigitux · gigitux · commit d356862d5cb7 · 2021-11-30T10:43:20.000+01:00
diff --git a/assets/js/blocks/cart-checkout/mini-cart/block.tsx b/assets/js/blocks/cart-checkout/mini-cart/block.tsx
@@ -120,11 +120,7 @@ const MiniCartBlock = ( {
 		isBoolean
 	);
 
-	const labelTaxName = getSettingWithCoercion(
-		'labelIncludingTax',
-		'',
-		isString
-	);
+	const taxLabel = getSettingWithCoercion( 'taxLabel', '', isString );
 
 	const subTotal = showIncludingTax
 		? parseInt( cartTotals.total_items, 10 ) +
@@ -167,9 +163,9 @@ const MiniCartBlock = ( {
 						getCurrencyFromPriceResponse( cartTotals )
 					) }
 				</span>
-				{ labelTaxName !== '' && subTotal !== 0 && (
-					<small className="wc-block-mini-cart__tax_label">
-						{ labelTaxName }
+				{ taxLabel !== '' && subTotal !== 0 && (
+					<small className="wc-block-mini-cart__tax-label">
+						{ taxLabel }
 					</small>
 				) }
 				<QuantityBadge
diff --git a/assets/js/settings/shared/test/get-setting-with-coercion.ts b/assets/js/settings/shared/test/get-setting-with-coercion.ts
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import { isBoolean, isString } from '@woocommerce/types';
+
+/**
+ * Internal dependencies
+ */
+import { ADMIN_URL } from '../default-constants';
+import { getSettingWithCoercion } from '..';
+
+describe( 'getSettingWithCoercion', () => {
+	it( 'returns provided default for non available setting', () => {
+		expect(
+			getSettingWithCoercion( 'nada', 'really nada', isString )
+		).toBe( 'really nada' );
+	} );
+	it( 'returns expected value for existing setting', () => {
+		expect(
+			getSettingWithCoercion( 'adminUrl', 'not this', isString )
+		).toEqual( ADMIN_URL );
+	} );
+	it( "returns expected value for existing setting even if it's a falsy value", () => {
+		expect(
+			getSettingWithCoercion( 'currentUserIsAdmin', true, isBoolean )
+		).toBe( false );
+	} );
+} );
diff --git a/src/BlockTypes/MiniCart.php b/src/BlockTypes/MiniCart.php
@@ -34,7 +34,7 @@ class MiniCart extends AbstractBlock {
 	 *
 	 * @var string
 	 */
-	protected $label_including_tax = '';
+	protected $tax_label = '';
 
 	/**
 	 *  Visibility of price including tax.
@@ -110,15 +110,12 @@ protected function enqueue_data( array $attributes = [] ) {
 
 			$label_info = $this->get_tax_label();
 
-			$label_including_tax               = $label_info['label_including_tax'];
-			$display_cart_prices_including_tax = $label_info['display_cart_prices_including_tax'];
-
-			$this->label_including_tax               = $label_including_tax;
-			$this->display_cart_prices_including_tax = $display_cart_prices_including_tax;
+			$this->tax_label                         = $label_info['tax_label'];
+			$this->display_cart_prices_including_tax = $label_info['display_cart_prices_including_tax'];
 
 			$this->asset_data_registry->add(
-				'labelIncludingTax',
-				$this->label_including_tax,
+				'taxLabel',
+				$this->tax_label,
 				''
 			);
 
@@ -249,7 +246,7 @@ protected function get_include_tax_label_markup() {
 		$cart                = $cart_controller->get_cart_instance();
 		$cart_contents_total = $cart->get_subtotal();
 
-		return ( ! empty( $this->label_including_tax ) && 0 !== $cart_contents_total ) ? ( "<small class='wc-block-mini-cart__tax_label'>" . $this->label_including_tax . '</small>' ) : '';
+		return ( ! empty( $this->tax_label ) && 0 !== $cart_contents_total ) ? ( "<small class='wc-block-mini-cart__tax-label'>" . esc_html( $this->tax_label ) . '</small>' ) : '';
 	}
 
 	/**
@@ -425,10 +422,10 @@ protected function get_tax_label() {
 
 		if ( $cart->display_prices_including_tax() ) {
 			if ( ! wc_prices_include_tax() ) {
-				$label_including_tax               = WC()->countries->inc_tax_or_vat();
+				$tax_label                         = WC()->countries->inc_tax_or_vat();
 				$display_cart_prices_including_tax = true;
 				return array(
-					'label_including_tax'               => $label_including_tax,
+					'tax_label'                         => $tax_label,
 					'display_cart_prices_including_tax' => $display_cart_prices_including_tax,
 				);
 			}
@@ -439,16 +436,15 @@ protected function get_tax_label() {
 		}
 
 		if ( wc_prices_include_tax() ) {
-			$label_including_tax               = WC()->countries->ex_tax_or_vat();
-			$display_cart_prices_including_tax = true;
+			$tax_label = WC()->countries->ex_tax_or_vat();
 			return array(
-				'label_including_tax'               => $label_including_tax,
+				'tax_label'                         => $tax_label,
 				'display_cart_prices_including_tax' => false,
 			);
 		};
 
 		return array(
-			'label_including_tax'               => '',
+			'tax_label'                         => '',
 			'display_cart_prices_including_tax' => false,
 		);
 	}
