Merge branch 'master' into symbol-service

Author: jaebradley

.gitignore

@@ -2,3 +2,4 @@ node_modules/*
 npm-debug.log
 coverage/
 build/
+package-lock.json

package.json

@@ -12,7 +12,6 @@
     "colors": "^1.1.2 ",
     "commander": "^2.9.0",
     "convert-units": "^2.0.1",
-    "currency-symbol-map": "^3.1.0",
     "enumify": "^1.0.4",
     "immutable": "^3.8.1",
     "node-emoji": "^1.4.3",

src/services/tables/TripPriceEstimateRowFormatter.js

@@ -1,4 +1,5 @@
 import CurrencySymbol from 'currency-symbol-map';
+
 import { List, Map } from 'immutable';
 
 import DistanceUnit from '../../data/DistanceUnit';
@@ -26,8 +27,15 @@ export default class TripPriceEstimateRowFormatter {
   }
 
   formatRange(range) {
-    const currencySymbol = CurrencySymbol(range.currencyCode);
-    return `${currencySymbol}${range.low}-${currencySymbol}${range.high}`;
+    return `${this.formatCurrencyValue(range.low, range.currencyCode)}-${this.formatCurrencyValue(range.high, range.currencyCode)}`;
+  }
+
+  formatCurrencyValue(value, currencyCode) {
+    return Intl.NumberFormat('en-US', {
+      style: 'currency',
+      maximumFractionDigits: 0,
+      currency: currencyCode,
+    }).format(value);
   }
 
   formatDistance(distance, rowDistanceUnit) {

test/services/tables/TripPriceEstimateRowFormatterTest.js

@@ -49,19 +49,26 @@ describe('Trip Price Estimate Row Formatter', () => {
     it('throws exception', () => expect(() => rowFormatter.getDistanceUnitAbbreviation('foo')).to.throw(TypeError));
   });
 
-  describe('format range', () => {
+  describe('#formatRange', () => {
     const range = {
       currencyCode: 'USD',
       low: 'foo',
       high: 'bar',
     };
 
     it('successfully', () => {
-      const expected = '$foo-$bar';
+      sandbox.stub(rowFormatter, 'formatCurrencyValue').callsFake((value, currencyCode) => `${value}-${currencyCode}`);
+      const expected = 'foo-USD-bar-USD';
       expect(rowFormatter.formatRange(range)).to.eql(expected);
     });
   });
 
+  describe('#formatCurrencyValue', () => {
+    it('succeeds', () => {
+      expect(rowFormatter.formatCurrencyValue(1234.567, 'USD')).to.eql('$1,235');
+    });
+  });
+
   describe('format distance', () => {
     it('succeeds', () => {
       const distanceConversion = sinon.stub(distanceConverter, 'convert').returns({ value: 1 });