Skip to content

Commit fed94bf

Browse files
committed
Fixing failed functional tests
1 parent 0a70b78 commit fed94bf

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

dev/tests/js/jasmine/spec_runner/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
'use strict';
77

88
var tasks = [],
9-
_ = require('underscore');
9+
_ = require('underscore'),
10+
root = typeof self == 'object' && self.self === self && self ||
11+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
12+
root._ = _;
1013

1114
function init(grunt, options) {
1215
var _ = require('underscore'),

dev/tests/js/jasmine/spec_runner/tasks/jasmine.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
'use strict';
77

88
var tasks = {},
9-
_ = require('underscore');
9+
_ = require('underscore'),
10+
root = typeof self == 'object' && self.self === self && self ||
11+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
12+
root._ = _;
1013

1114
function init(config) {
1215
var grunt = require('grunt'),

dev/tools/grunt/configs/clean.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
'use strict';
77

88
var themes = require('../tools/files-router').get('themes'),
9-
_ = require('underscore');
9+
_ = require('underscore'),
10+
root = typeof self == 'object' && self.self === self && self ||
11+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
12+
root._ = _;
1013

1114
var themeOptions = {};
1215

dev/tools/grunt/configs/exec.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
var combo = require('./combo'),
99
themes = require('../tools/files-router').get('themes'),
10-
_ = require('underscore');
10+
_ = require('underscore'),
11+
root = typeof self == 'object' && self.self === self && self ||
12+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
13+
root._ = _;
1114

1215
var themeOptions = {};
1316

dev/tools/grunt/configs/less.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
var combo = require('./combo'),
99
themes = require('../tools/files-router').get('themes'),
10-
_ = require('underscore');
10+
_ = require('underscore'),
11+
root = typeof self == 'object' && self.self === self && self ||
12+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
13+
root._ = _;
1114

1215
var themeOptions = {};
1316

dev/tools/grunt/configs/watch.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
var combo = require('./combo'),
99
themes = require('../tools/files-router').get('themes'),
10-
_ = require('underscore');
10+
_ = require('underscore'),
11+
root = typeof self == 'object' && self.self === self && self ||
12+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
13+
root._ = _;
1114

1215
var themeOptions = {};
1316

dev/tools/grunt/tasks/mage-minify.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ module.exports = function (grunt) {
66
'use strict';
77

88
var compressor = require('node-minify'),
9-
_ = require('underscore');
9+
_ = require('underscore'),
10+
root = typeof self == 'object' && self.self === self && self ||
11+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
12+
root._ = _;
1013

1114
/**
1215
* Helper function used to create config object for compressor.

lib/web/mage/utils/main.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ define(function (require) {
66
'use strict';
77

88
var utils = {},
9-
_ = require('underscore');
9+
_ = require('underscore'),
10+
root = typeof self == 'object' && self.self === self && self ||
11+
typeof global == 'object' && global.global === global && global || Function('return this')() || {};
12+
root._ = _;
1013

1114
return _.extend(
1215
utils,

0 commit comments

Comments
 (0)