Merge pull request #12831 from emberjs/fix-jshint

Fix jshint warnings
emberjs · Jan 18, 2016 · f2adc4f · f2adc4f
2 parents 7f5bcd5 + f8d5517
commit f2adc4f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/ember-htmlbars/tests/attr_nodes/sanitized_test.js b/packages/ember-htmlbars/tests/attr_nodes/sanitized_test.js
@@ -56,6 +56,7 @@ var badTags = [
 ];
 
 for (var i = 0, l = badTags.length; i < l; i++) {
+  /* jshint -W083 */
   (function() {
     var subject = badTags[i];
 
@@ -118,6 +119,7 @@ for (var i = 0, l = badTags.length; i < l; i++) {
             'unsafe:javascript://example.com',
             'attribute is output');
     });
-  })(); //jshint ignore:line
+  })();
+  /* jshint +W083 */
 }
 // jscs:enable disallowTrailingWhitespace
diff --git a/packages/ember-runtime/lib/ext/rsvp.js b/packages/ember-runtime/lib/ext/rsvp.js
@@ -1,5 +1,3 @@
-/* globals RSVP:true */
-
 import Ember from 'ember-metal/core';
 import require, { has } from 'require';
 import { assert } from 'ember-metal/debug';

diff --git a/packages/ember-runtime/tests/ext/rsvp_test.js b/packages/ember-runtime/tests/ext/rsvp_test.js
@@ -1,4 +1,3 @@
-/* global Promise:true */
 import Ember from 'ember-metal/core';
 import run from 'ember-metal/run_loop';
 import RSVP from 'ember-runtime/ext/rsvp';
@@ -22,7 +21,6 @@ QUnit.test('Ensure that errors thrown from within a promise are sent to the cons
 
 var asyncStarted = 0;
 var asyncEnded = 0;
-var Promise = RSVP.Promise;
 
 var EmberTest;
 var EmberTesting;
@@ -64,7 +62,7 @@ QUnit.test('given `Ember.testing = true`, correctly informs the test suite about
   equal(asyncStarted, 0);
   equal(asyncEnded, 0);
 
-  var user = Promise.resolve({
+  var user = RSVP.Promise.resolve({
     name: 'tomster'
   });
 
@@ -77,15 +75,15 @@ QUnit.test('given `Ember.testing = true`, correctly informs the test suite about
 
     equal(user.name, 'tomster');
 
-    return Promise.resolve(1).then(function() {
+    return RSVP.Promise.resolve(1).then(function() {
       equal(asyncStarted, 1);
       equal(asyncEnded, 1);
     });
   }).then(function() {
     equal(asyncStarted, 1);
     equal(asyncEnded, 1);
 
-    return new Promise(function(resolve) {
+    return new RSVP.Promise(function(resolve) {
       QUnit.stop(); // raw async, we must inform the test framework manually
       setTimeout(function() {
         QUnit.start(); // raw async, we must inform the test framework manually
@@ -270,7 +268,7 @@ QUnit.test('handled in the same microTask Queue flush do to data locality', func
   // it depends on the locality of `user#1`
   var store = {
     find() {
-      return Promise.resolve(1);
+      return RSVP.Promise.resolve(1);
     }
   };