Cleanup things and stuff

tests/helpers/async.js

@@ -3,20 +3,18 @@ import Ember from 'ember';
 export function wait(callback, timeout) {
   let done = this.async();
 
-  var timer = setTimeout(() => {
+  let timer = setTimeout(() => {
     this.ok(false, "Timeout was reached");
     done();
   }, timeout || 200);
 
   return function() {
     window.clearTimeout(timer);
 
-    var args = arguments;
-    var result;
+    let args = arguments;
+    let result;
     try {
-      result = Ember.run(function() {
-        return callback.apply(this, args);
-      });
+      result = Ember.run(() => callback.apply(this, args));
     } finally {
       done();
     }
@@ -25,14 +23,15 @@ export function wait(callback, timeout) {
 }
 
 export function asyncEqual(a, b, message) {
-  return Ember.RSVP.all([Ember.RSVP.resolve(a), Ember.RSVP.resolve(b)]).then(this.wait((array) => {
+  return Ember.RSVP.all([
+    Ember.RSVP.resolve(a),
+    Ember.RSVP.resolve(b)
+  ]).then(this.wait((array) => {
     this.push(array[0] === array[1], array[0], array[1], message);
   }));
 }
 
-export function invokeAsync(callback, timeout) {
-  timeout = timeout || 1;
-
-  setTimeout(this.wait(callback, timeout+100), timeout);
+export function invokeAsync(callback, timeout = 1) {
+  setTimeout(this.wait(callback, timeout + 100), timeout);
 }
 

tests/helpers/custom-adapter.js

@@ -1,14 +1,12 @@
 import Ember from 'ember';
-
 import DS from 'ember-data';
 
-
 export default function(env, adapterDefinition) {
-  var adapter = adapterDefinition;
+  let adapter = adapterDefinition;
   if (!DS.Adapter.detect(adapterDefinition)) {
     adapter = DS.Adapter.extend(adapterDefinition);
   }
-  var store = env.store;
+  let store = env.store;
   env.registry.register('adapter:-custom', adapter);
   Ember.run(() => store.set('adapter', '-custom'));
 }

tests/helpers/setup-ember-dev.js

@@ -5,7 +5,7 @@ import EmberTestHelpers from "ember-dev/test-helper/index";
 const AVAILABLE_ASSERTIONS = ['expectAssertion', 'expectDeprecation', 'expectNoDeprecation', 'expectWarning', 'expectNoWarning', 'ignoreDeprecation'];
 
 // Maintain backwards compatiblity with older versions of ember.
-var emberDebugModule;
+let emberDebugModule;
 if (Ember.__loader && Ember.__loader.registry && Ember.__loader.registry["ember-metal/debug"]) {
   emberDebugModule = Ember.__loader.require('ember-metal/debug');
 }
@@ -26,7 +26,7 @@ function setDebugFunction(name, func) {
   }
 }
 
-var originalModule = QUnit.module;
+const originalModule = QUnit.module;
 
 /**
  * We patch QUnit.module here so we can setup and teardown the helpers from
@@ -37,14 +37,14 @@ var originalModule = QUnit.module;
  * make the corresponding test fail.
  */
 QUnit.module = function(name, options = {}) {
-  var testHelpers = new EmberTestHelpers({
+  let testHelpers = new EmberTestHelpers({
     Ember,
     getDebugFunction,
     setDebugFunction
   });
 
-  var originalBeforeEach = options.beforeEach || function() { };
-  var originalAfterEach = options.afterEach || function() { };
+  let originalBeforeEach = options.beforeEach || function() { };
+  let originalAfterEach = options.afterEach || function() { };
 
   options.beforeEach = function(assert) {
     testHelpers.reset();

tests/helpers/store.js

@@ -3,8 +3,8 @@ import DS from 'ember-data';
 import Owner from './owner';
 
 export default function setupStore(options) {
-  var container, registry, owner;
-  var env = {};
+  let container, registry, owner;
+  let env = {};
   options = options || {};
 
   if (Ember.Registry) {
@@ -29,15 +29,15 @@ export default function setupStore(options) {
     }
   };
 
-  var adapter = env.adapter = (options.adapter || '-default');
+  let adapter = env.adapter = (options.adapter || '-default');
   delete options.adapter;
 
   if (typeof adapter !== 'string') {
     env.registry.register('adapter:-ember-data-test-custom', adapter);
     adapter = '-ember-data-test-custom';
   }
 
-  for (var prop in options) {
+  for (let prop in options) {
     registry.register('model:' + Ember.String.dasherize(prop), options[prop]);
   }
 

tests/helpers/test-in-debug.js

@@ -4,9 +4,7 @@ import { test, skip } from 'qunit';
 export default function testInDebug() {
   let isDebug = false;
 
-  runInDebug(function() {
-    isDebug = true;
-  });
+  runInDebug(() => isDebug = true);
 
   if (isDebug) {
     test(...arguments);

tests/test-helper.js

@@ -17,9 +17,15 @@ setResolver(resolver);
 loadInitializers(Ember.Application, 'dummy');
 
 const { assert } = QUnit;
+const transforms = {
+  boolean: DS.BooleanTransform.create(),
+  date:    DS.DateTransform.create(),
+  number:  DS.NumberTransform.create(),
+  string:  DS.StringTransform.create()
+};
 
-QUnit.begin(function() {
-  Ember.RSVP.configure('onerror', function(reason) {
+QUnit.begin(() => {
+  Ember.RSVP.configure('onerror', reason => {
     // only print error messages if they're exceptions;
     // otherwise, let a future turn of the event loop
     // handle the error.
@@ -29,13 +35,6 @@ QUnit.begin(function() {
     }
   });
 
-  var transforms = {
-    'boolean': DS.BooleanTransform.create(),
-    'date': DS.DateTransform.create(),
-    'number': DS.NumberTransform.create(),
-    'string': DS.StringTransform.create()
-  };
-
   // Prevent all tests involving serialization to require a container
   DS.JSONSerializer.reopen({
     transformFor(attributeType) {
@@ -49,8 +48,8 @@ assert.wait = wait;
 assert.asyncEqual = asyncEqual;
 assert.invokeAsync = invokeAsync;
 assert.assertClean = function(promise) {
-  return promise.then(this.wait((record) => {
-    this.equal(record.get('hasDirtyAttributes'), false, "The record is now clean");
+  return promise.then(this.wait(record => {
+    this.equal(record.get('hasDirtyAttributes'), false, 'The record is now clean');
     return record;
   }));
 };
@@ -64,4 +63,7 @@ assert.without = function(array, item)  {
 };
 
 QUnit.config.testTimeout = 2000;
-QUnit.config.urlConfig.push({ id: 'enableoptionalfeatures', label: "Enable Opt Features" });
+QUnit.config.urlConfig.push({
+  id: 'enableoptionalfeatures',
+  label: 'Enable Opt Features'
+});