Merge pull request #17323 from Rik/jshint-settings-985409

Bug 985409 - Fix JSHint issues with test/unit/setup.js r=arthur
mozilla-b2g · Mar 19, 2014 · da16c2c · da16c2c
2 parents 16b7f7c + 5d3e261
commit da16c2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/settings/test/unit/setup.js b/apps/settings/test/unit/setup.js
@@ -1,5 +1,7 @@
 'use strict';
 
+/* global requirejs */
+
 require('/shared/test/unit/mocks/mocks_helper.js');
 requireApp('settings/js/vendor/alameda.js', (function() {
   var requireFunc = requirejs.config({
@@ -49,4 +51,4 @@ requireApp('settings/js/vendor/alameda.js', (function() {
 
     requireFunc(module, callback);
   };
-}).bind(this));
+}).bind(window));
diff --git a/build/jshint/xfail.list b/build/jshint/xfail.list
@@ -679,7 +679,6 @@ apps/settings/test/unit/sim_settings_helper_test.js
 apps/settings/test/unit/simcard_manager_simcard_helper_test.js
 apps/settings/test/unit/toaster_test.js
 apps/settings/test/unit/wifi_helper_test.js
-apps/settings/test/unit/setup.js
 apps/system/emergency-call/js/keypad.js
 apps/system/js/accessibility.js
 apps/system/js/activity_window.js