Use Ember.deprecate over warn, replace usages of fmt

packages/ember-htmlbars/lib/helpers/bind-attr.js

@@ -5,7 +5,6 @@
 
 import Ember from "ember-metal/core"; // Ember.assert
 
-import { fmt } from "ember-runtime/system/string";
 import AttrNode from "ember-views/attr_nodes/attr_node";
 import LegacyBindAttrNode from "ember-views/attr_nodes/legacy_bind";
 import keys from "ember-metal/keys";
@@ -181,8 +180,8 @@ function bindAttrHelper(params, hash, options, env) {
       lazyValue = path;
     } else {
       Ember.assert(
-        fmt("You must provide an expression as the value of bound attribute." +
-            " You specified: %@=%@", [attr, path]),
+        "You must provide an expression as the value of bound attribute." +
+        ` You specified: ${attr}=${path}`,
         typeof path === 'string'
       );
       lazyValue = view.getStream(path);

packages/ember-htmlbars/lib/helpers/collection.js

@@ -5,7 +5,6 @@
 
 import Ember from "ember-metal/core"; // Ember.assert, Ember.deprecate
 import { IS_BINDING } from "ember-metal/mixin";
-import { fmt } from "ember-runtime/system/string";
 import { get } from "ember-metal/property_get";
 import CollectionView from "ember-views/views/collection_view";
 import { readViewFactory } from "ember-views/streams/utils";
@@ -161,7 +160,7 @@ export function collectionHelper(params, hash, options, env) {
   var collectionClass;
   if (path) {
     collectionClass = readViewFactory(path, container);
-    Ember.assert(fmt("%@ #collection: Could not find collection class %@", [data.view, path]), !!collectionClass);
+    Ember.assert(`${data.view} #collection: Could not find collection class ${path}`, !!collectionClass);
   } else {
     collectionClass = CollectionView;
   }
@@ -185,7 +184,7 @@ export function collectionHelper(params, hash, options, env) {
     itemViewClass = container.lookupFactory('view:'+itemViewClass);
   }
 
-  Ember.assert(fmt("%@ #collection: Could not find itemViewClass %@", [data.view, itemViewClass]), !!itemViewClass);
+  Ember.assert(`${data.view} #collection: Could not find itemViewClass ${itemViewClass}`, !!itemViewClass);
 
   delete hash.itemViewClass;
   delete hash.itemView;

packages/ember-htmlbars/tests/helpers/bind_attr_test.js

@@ -7,7 +7,6 @@ import Namespace from "ember-runtime/system/namespace";
 import EmberView from "ember-views/views/view";
 import _MetamorphView from "ember-views/views/metamorph_view";
 import EmberObject from "ember-runtime/system/object";
-import { strFmtDeprecationWarning } from "ember-runtime/system/string";
 import { A } from "ember-runtime/system/native_array";
 import { computed } from "ember-metal/computed";
 import { observersFor } from "ember-metal/observer";
@@ -661,7 +660,7 @@ if (!EmberDev.runningProdBuild) {
 
     runAppend(view);
 
-    deepEqual(warnings, [strFmtDeprecationWarning, styleWarning]);
+    deepEqual(warnings, [styleWarning]);
   });
 }
 
@@ -673,5 +672,5 @@ QUnit.test('specifying `<div {{bind-attr style=userValue}}></div>` works properl
 
   runAppend(view);
 
-  deepEqual(warnings, [strFmtDeprecationWarning]);
+  deepEqual(warnings, []);
 });

packages/ember-htmlbars/tests/helpers/if_unless_test.js

@@ -8,7 +8,6 @@ import _MetamorphView from 'ember-views/views/metamorph_view';
 import compile from "ember-template-compiler/system/compile";
 
 import { set } from 'ember-metal/property_set';
-import { fmt } from 'ember-runtime/system/string';
 import { typeOf } from 'ember-metal/utils';
 import { forEach } from 'ember-metal/enumerable_utils';
 import { runAppend, runDestroy } from "ember-runtime/tests/utils";
@@ -281,7 +280,7 @@ QUnit.test('should update the block when object passed to #unless helper changes
       set(view, 'onDrugs', val);
     });
 
-    equal(view.$('h1').text(), 'Eat your vegetables', fmt('renders block when conditional is "%@"; %@', [String(val), typeOf(val)]));
+    equal(view.$('h1').text(), 'Eat your vegetables', `renders block when conditional is "${String(val)}"; ${typeOf(val)}`);
 
     run(function() {
       set(view, 'onDrugs', true);
@@ -336,7 +335,7 @@ QUnit.test('should update the block when object passed to #if helper changes', f
       set(view, 'inception', val);
     });
 
-    equal(view.$('h1').text(), '', fmt('hides block when conditional is "%@"', [String(val)]));
+    equal(view.$('h1').text(), '', `hides block when conditional is "${String(val)}"`);
 
     run(function() {
       set(view, 'inception', true);
@@ -371,7 +370,7 @@ QUnit.test('should update the block when object passed to #if helper changes and
       set(view, 'inception', val);
     });
 
-    equal(view.$('h1').text(), 'BOONG?', fmt('renders alternate if %@', [String(val)]));
+    equal(view.$('h1').text(), 'BOONG?', `renders alternate if ${String(val)}`);
 
     run(function() {
       set(view, 'inception', true);
@@ -444,7 +443,7 @@ QUnit.test('should update the block when object passed to #unless helper changes
       set(view, 'onDrugs', val);
     });
 
-    equal(view.$('h1').text(), 'Eat your vegetables', fmt('renders block when conditional is "%@"; %@', [String(val), typeOf(val)]));
+    equal(view.$('h1').text(), 'Eat your vegetables', `renders block when conditional is "${String(val)}"; ${typeOf(val)}`);
 
     run(function() {
       set(view, 'onDrugs', true);
@@ -499,7 +498,7 @@ QUnit.test('should update the block when object passed to #if helper changes', f
       set(view, 'inception', val);
     });
 
-    equal(view.$('h1').text(), '', fmt('hides block when conditional is "%@"', [String(val)]));
+    equal(view.$('h1').text(), '', `hides block when conditional is "${String(val)}"`);
 
     run(function() {
       set(view, 'inception', true);
@@ -534,7 +533,7 @@ QUnit.test('should update the block when object passed to #if helper changes and
       set(view, 'inception', val);
     });
 
-    equal(view.$('h1').text(), 'BOONG?', fmt('renders alternate if %@', [String(val)]));
+    equal(view.$('h1').text(), 'BOONG?', `renders alternate if ${String(val)}`);
 
     run(function() {
       set(view, 'inception', true);

packages/ember-routing-views/lib/views/link.js

@@ -9,7 +9,6 @@ import { get } from "ember-metal/property_get";
 import merge from "ember-metal/merge";
 import run from "ember-metal/run_loop";
 import { computed } from "ember-metal/computed";
-import { fmt } from "ember-runtime/system/string";
 import keys from "ember-metal/keys";
 import { isSimpleClick } from "ember-views/system/utils";
 import EmberComponent from "ember-views/views/component";
@@ -499,10 +498,9 @@ var LinkView = EmberComponent.extend({
 
     if (!namedRoute) { return; }
 
-    Ember.assert(fmt("The attempt to link-to route '%@' failed. " +
-                     "The router did not find '%@' in its possible routes: '%@'",
-                     [namedRoute, namedRoute, keys(router.router.recognizer.names).join("', '")]),
-                     router.hasRoute(namedRoute));
+    Ember.assert(`The attempt to link-to route '${namedRoute}' failed. ` +
+                 `The router did not find '${namedRoute}' in its possible routes: '${keys(router.router.recognizer.names).join("', '")}'`,
+                 router.hasRoute(namedRoute));
 
     if (!paramsAreLoaded(resolvedParams.models)) { return; }
 

packages/ember-routing/lib/system/router.js

@@ -7,7 +7,6 @@ import { computed } from "ember-metal/computed";
 import merge from "ember-metal/merge";
 import run from "ember-metal/run_loop";
 
-import { fmt } from "ember-runtime/system/string";
 import EmberObject from "ember-runtime/system/object";
 import Evented from "ember-runtime/mixins/evented";
 import EmberRouterDSL from "ember-routing/system/dsl";
@@ -498,12 +497,14 @@ var EmberRouter = EmberObject.extend(Evented, {
 
     for (var key in groupedByUrlKey) {
       var qps = groupedByUrlKey[key];
-      Ember.assert(fmt("You're not allowed to have more than one controller " +
-                       "property map to the same query param key, but both " +
-                       "`%@` and `%@` map to `%@`. You can fix this by mapping " +
-                       "one of the controller properties to a different query " +
-                       "param key via the `as` config option, e.g. `%@: { as: 'other-%@' }`",
-                       [qps[0].qp.fprop, qps[1] ? qps[1].qp.fprop : "", qps[0].qp.urlKey, qps[0].qp.prop, qps[0].qp.prop]), qps.length <= 1);
+      Ember.assert("You're not allowed to have more than one controller " +
+                   "property map to the same query param key, but both " +
+                   `"${qps[0].qp.fprop}" and "${qps[1] ? qps[1].qp.fprop : ""}" ` +
+                   `map to "${qps[0].qp.urlKey}". You can fix this by mapping ` +
+                   "one of the controller properties to a different query " +
+                   'param key via the "as" config option, e.g. ' +
+                   `"${qps[0].qp.prop}: { as: 'other-${qps[0].qp.prop}' }"`,
+                   qps.length <= 1);
       var qp = qps[0].qp;
       queryParams[qp.urlKey] = qp.route.serializeQueryParam(qps[0].value, qp.urlKey, qp.type);
     }

packages/ember-runtime/lib/mixins/-proxy.js

@@ -20,7 +20,6 @@ import {
 import { computed } from "ember-metal/computed";
 import { defineProperty } from "ember-metal/properties";
 import { Mixin, observer } from "ember-metal/mixin";
-import { fmt } from "ember-runtime/system/string";
 
 function contentPropertyWillChange(content, contentKey) {
   var key = contentKey.slice(8); // remove "content."
@@ -74,8 +73,8 @@ export default Mixin.create({
     var content = get(this, 'content');
     if (content) {
       Ember.deprecate(
-        fmt('You attempted to access `%@` from `%@`, but object proxying is deprecated. ' +
-            'Please use `model.%@` instead.', [key, this, key]),
+        `You attempted to access "${key}" from "${this}", but object proxying is deprecated. ` +
+        `Please use "model.${key}" instead.`,
         !this.isController
       );
       return get(content, key);
@@ -92,12 +91,12 @@ export default Mixin.create({
     }
 
     var content = get(this, 'content');
-    Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of" +
-                     " object proxy %@: its 'content' is undefined.", [key, value, this]), content);
+    Ember.assert(`Cannot delegate set("${key}", ${value}) to the "content" property of` +
+                 ` object proxy ${this}: its "content" is undefined.`, content);
 
     Ember.deprecate(
-      fmt('You attempted to set `%@` from `%@`, but object proxying is deprecated. ' +
-          'Please use `model.%@` instead.', [key, this, key]),
+      `You attempted to set "${key}" from "${this}", but object proxying is deprecated. ` +
+      `Please use "model.${key}" instead.`,
       !this.isController
     );
     return set(content, key, value);

packages/ember-runtime/lib/mixins/copyable.js

@@ -7,7 +7,6 @@
 import { get } from "ember-metal/property_get";
 import { Mixin } from "ember-metal/mixin";
 import { Freezable } from "ember-runtime/mixins/freezable";
-import { fmt } from "ember-runtime/system/string";
 import EmberError from 'ember-metal/error';
 
 
@@ -57,7 +56,7 @@ export default Mixin.create({
     if (Freezable && Freezable.detect(this)) {
       return get(this, 'isFrozen') ? this : this.copy().freeze();
     } else {
-      throw new EmberError(fmt("%@ does not support freezing", [this]));
+      throw new EmberError(`${this} does not support freezing`);
     }
   }
 });

packages/ember-runtime/lib/system/array_proxy.js

@@ -16,7 +16,6 @@ import EmberError from "ember-metal/error";
 import EmberObject from "ember-runtime/system/object";
 import MutableArray from "ember-runtime/mixins/mutable_array";
 import Enumerable from "ember-runtime/mixins/enumerable";
-import { fmt } from "ember-runtime/system/string";
 import alias from "ember-metal/alias";
 
 /**
@@ -185,8 +184,8 @@ var ArrayProxy = EmberObject.extend(MutableArray, {
     var content = get(this, 'content');
 
     if (content) {
-      Ember.assert(fmt('ArrayProxy expects an Array or ' +
-        'Ember.ArrayProxy, but you passed %@', [typeof content]),
+      Ember.assert('ArrayProxy expects an Array or ' +
+        `Ember.ArrayProxy, but you passed ${typeof content}`,
         isArray(content) || content.isDestroyed);
 
       content.addArrayObserver(this, {
@@ -222,8 +221,8 @@ var ArrayProxy = EmberObject.extend(MutableArray, {
     var arrangedContent = get(this, 'arrangedContent');
 
     if (arrangedContent) {
-      Ember.assert(fmt('ArrayProxy expects an Array or ' +
-        'Ember.ArrayProxy, but you passed %@', [typeof arrangedContent]),
+      Ember.assert('ArrayProxy expects an Array or ' +
+        `Ember.ArrayProxy, but you passed ${typeof arrangedContent}`,
         isArray(arrangedContent) || arrangedContent.isDestroyed);
 
       arrangedContent.addArrayObserver(this, {

packages/ember-runtime/lib/system/set.js

@@ -8,7 +8,6 @@ import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";
 import { guidFor } from "ember-metal/utils";
 import isNone from 'ember-metal/is_none';
-import { fmt } from "ember-runtime/system/string";
 import CoreObject from "ember-runtime/system/core_object";
 import MutableEnumerable from "ember-runtime/mixins/mutable_enumerable";
 import Enumerable from "ember-runtime/mixins/enumerable";
@@ -496,6 +495,6 @@ export default CoreObject.extend(MutableEnumerable, Copyable, Freezable, {
     for (idx = 0; idx < len; idx++) {
       array[idx] = this[idx];
     }
-    return fmt("Ember.Set<%@>", [array.join(',')]);
+    return `Ember.Set<${array.join(',')}>`;
   }
 });

packages/ember-runtime/lib/system/string.js

@@ -54,11 +54,8 @@ var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
 var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
 var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 
-var strFmtDeprecationWarning = 'Use of Ember.String.fmt() is deprecated. Use ES6 template strings instead: https://babeljs.io/docs/learn-es6/#template-strings';
-
 function fmt(str, formats) {
   //Ember.deprecate('Use of Ember.String.fmt() is deprecated. Use ES6 template strings instead: https://babeljs.io/docs/learn-es6/#template-strings');
-  Ember.warn(strFmtDeprecationWarning);
   var cachedFormats = formats;
 
   if (!isArray(cachedFormats) || arguments.length > 2) {
@@ -314,6 +311,5 @@ export {
   camelize,
   classify,
   underscore,
-  capitalize,
-  strFmtDeprecationWarning
+  capitalize
 };

packages/ember-runtime/tests/controllers/object_controller_test.js

@@ -41,7 +41,7 @@ QUnit.test('accessing model properties via proxy behavior results in a deprecati
 
   expectDeprecation(function() {
     controller.get('bar');
-  }, /object proxying is deprecated\. Please use `model\.bar` instead\./);
+  }, /object proxying is deprecated\. Please use "model\.bar" instead\./);
 });
 
 QUnit.test('setting model properties via proxy behavior results in a deprecation [DEPRECATED]', function() {
@@ -58,7 +58,7 @@ QUnit.test('setting model properties via proxy behavior results in a deprecation
 
   expectDeprecation(function() {
     controller.set('bar', 'derp');
-  }, /object proxying is deprecated\. Please use `model\.bar` instead\./);
+  }, /object proxying is deprecated\. Please use "model\.bar" instead\./);
 });
 
 QUnit.test('auto-generated controllers are not deprecated', function() {

packages/ember-runtime/tests/legacy_1x/mixins/observable/observable_test.js

@@ -5,7 +5,6 @@ import run from 'ember-metal/run_loop';
 import { typeOf } from 'ember-metal/utils';
 import { observer } from 'ember-metal/mixin';
 import {
-  fmt,
   w
 } from "ember-runtime/system/string";
 import EmberObject from 'ember-runtime/system/object';
@@ -431,17 +430,17 @@ QUnit.test("getting values should call function return value", function() {
   var keys = w('computed computedCached dependent dependentFront dependentCached');
 
   forEach(keys, function(key) {
-    equal(object.get(key), key, fmt('Try #1: object.get(%@) should run function', [key]));
-    equal(object.get(key), key, fmt('Try #2: object.get(%@) should run function', [key]));
+    equal(object.get(key), key, `Try #1: object.get(${key}) should run function`);
+    equal(object.get(key), key, `Try #2: object.get(${key}) should run function`);
   });
 
   // verify each call count.  cached should only be called once
   forEach(w('computedCalls dependentFrontCalls dependentCalls'), function(key) {
-    equal(object[key].length, 2, fmt('non-cached property %@ should be called 2x', [key]));
+    equal(object[key].length, 2, `non-cached property ${key} should be called`);
   });
 
   forEach(w('computedCachedCalls dependentCachedCalls'), function(key) {
-    equal(object[key].length, 1, fmt('non-cached property %@ should be called 1x', [key]));
+    equal(object[key].length, 1, `non-cached property ${key} should be called`);
   });
 
 });
@@ -454,11 +453,11 @@ QUnit.test("setting values should call function return value", function() {
 
   forEach(keys, function(key) {
 
-    equal(object.set(key, values[0]), object, fmt('Try #1: object.set(%@, %@) should run function', [key, values[0]]));
+    equal(object.set(key, values[0]), object, `Try #1: object.set(${key}, ${values[0]}) should run function`);
 
-    equal(object.set(key, values[1]), object, fmt('Try #2: object.set(%@, %@) should run function', [key, values[1]]));
+    equal(object.set(key, values[1]), object, `Try #2: object.set(${key}, ${values[1]}) should run function`);
 
-    equal(object.set(key, values[1]), object, fmt('Try #3: object.set(%@, %@) should not run function since it is setting same value as before', [key, values[1]]));
+    equal(object.set(key, values[1]), object, `Try #3: object.set(${key}, ${values[1]}) should not run function since it is setting same value as before`);
 
   });
 
@@ -471,9 +470,9 @@ QUnit.test("setting values should call function return value", function() {
     // Cached properties first check their cached value before setting the
     // property. Other properties blindly call set.
     expectedLength = 3;
-    equal(calls.length, expectedLength, fmt('set(%@) should be called the right amount of times', [key]));
+    equal(calls.length, expectedLength, `set(${key}) should be called the right amount of times`);
     for (idx=0;idx<2;idx++) {
-      equal(calls[idx], values[idx], fmt('call #%@ to set(%@) should have passed value %@', [idx+1, key, values[idx]]));
+      equal(calls[idx], values[idx], `call #${idx+1} to set(${key}) should have passed value ${values[idx]}`);
     }
   });