trailing spaces in price regex

ecommerce/static/js/pages/basket_page.js

@@ -269,9 +269,9 @@ define([
             },
 
             generateLocalPriceText: function(usdPriceText) {
-                // Assumes price value is prefixed by $ or USD with optional sign
+                // Assumes price value is prefixed by $ or USD with optional sign followed by optional string
                 var localPriceText = usdPriceText,
-                    prefixMatch = localPriceText.match(/(\$|USD).*/),
+                    prefixMatch = localPriceText.match(/(\$|USD)?(([1-9][0-9]{0,2}(,[0-9]{3})*)|[0-9]+)?\.[0-9]{1,2}/),
                     entireMatch,
                     groupMatch,
                     startIndex,
@@ -281,7 +281,8 @@ define([
                     entireMatch = prefixMatch[0];
                     groupMatch = prefixMatch[1];
                     startIndex = prefixMatch.index;
-                    priceValue = localPriceText.substring(startIndex + groupMatch.length);
+                    priceValue = localPriceText
+                      .substring(startIndex + groupMatch.length, startIndex + entireMatch.length);
 
                     localPriceText = localPriceText
                         .replace(entireMatch, BasketPage.formatToLocalPrice(groupMatch, priceValue));

ecommerce/static/js/test/specs/pages/basket_page_spec.js

@@ -636,8 +636,14 @@ define([
 
                 it('should replace commaseparated values', function() {
                     spyOn(BasketPage, 'formatToLocalPrice').and.returnValue('foo');
-                    expect('-foo').toEqual(BasketPage.generateLocalPriceText('-$1,234'));
-                    expect(BasketPage.formatToLocalPrice).toHaveBeenCalledWith('$', '1,234');
+                    expect('-foo').toEqual(BasketPage.generateLocalPriceText('-$1,234.56'));
+                    expect(BasketPage.formatToLocalPrice).toHaveBeenCalledWith('$', '1,234.56');
+                });
+
+                it('should only replace currency value', function() {
+                    spyOn(BasketPage, 'formatToLocalPrice').and.returnValue('foo');
+                    expect('baz -foo bar').toEqual(BasketPage.generateLocalPriceText('baz -$1,234.56 bar'));
+                    expect(BasketPage.formatToLocalPrice).toHaveBeenCalledWith('$', '1,234.56');
                 });
 
                 it('should not replace text without USD values', function() {