Make node tests have _ and Dict automatically as global vars.

Having to explicitly call out the underscore/Dict dependencies
in nearly every test has proven to be more cumbersome than helpful.
We never monkeypatch those modules in the tests.

(imported from commit 49ef70c835edd4e22a5869eda9235ef3ffc3c59b)
This commit is contained in:
Steve Howell 2014-02-01 09:44:52 -05:00
parent 20cfb9fe84
commit d8eb8792ef
17 changed files with 7 additions and 45 deletions

View File

@ -10,9 +10,7 @@ set_global('$', function () {
$.fn = {};
add_dependencies({
_: 'third/underscore/underscore.js',
util: 'js/util.js',
Dict: 'js/dict.js',
people: 'js/people.js'
});

View File

@ -1,9 +1,5 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js'
});
set_global('page_params', {
alert_words: ['alertone', 'alerttwo', 'alertthree', 'al*rt.*s', '.+'],
email: 'tester@zulip.com'

View File

@ -1,10 +1,5 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
Dict: 'js/dict.js'
});
var ct = require('js/composebox_typeahead.js');
var people_in_realm = [{email: 'othello@zulip.com', full_name: "Othello, Moor of Venice"},

View File

@ -1,9 +1,6 @@
add_dependencies({
_: 'third/underscore/underscore.js'
});
var _ = global._;
var Dict = require('js/dict.js');
var Dict = global.Dict;
var assert = require('assert');
set_global('blueslip', {});

View File

@ -6,9 +6,7 @@ var fs = require('fs');
set_global('page_params', {realm_emoji: {}});
add_dependencies({
_: 'third/underscore/underscore.js',
marked: 'third/marked/lib/marked.js',
Dict: 'js/dict.js',
emoji: 'js/emoji.js',
people: 'js/people.js',
fenced_code: 'js/fenced_code.js'

View File

@ -1,9 +1,7 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
util: 'js/util.js',
Dict: 'js/dict.js',
stream_data: 'js/stream_data.js'
});

View File

@ -1,7 +1,10 @@
var fs = require('fs');
var _ = require('third/underscore/underscore.js');
var Handlebars = require('handlebars');
global.Dict = require('js/dict');
global._ = require('third/underscore/underscore.js');
var _ = global._;
// Run all the JS scripts in our test directory. Tests do NOT run
// in isolation.

View File

@ -5,9 +5,7 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
util: 'js/util.js',
Dict: 'js/dict.js',
muting: 'js/muting.js',
MessageListView: 'js/message_list_view.js'
});

View File

@ -1,10 +1,5 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
Dict: 'js/dict.js'
});
set_global('page_params', {
domain: 'zulip.com'
});

View File

@ -1,8 +1,6 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
Dict: 'js/dict.js',
stream_data: 'js/stream_data.js',
Filter: 'js/filter.js'
});

View File

@ -8,9 +8,7 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
util: 'js/util.js',
Dict: 'js/dict.js',
Handlebars: 'handlebars',
Filter: 'js/filter.js',
typeahead_helper: 'js/typeahead_helper.js',

View File

@ -1,9 +1,5 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js'
});
set_global('$', function (f) {});
var stream_color = require('js/stream_color.js');

View File

@ -1,8 +1,6 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
Dict: 'js/dict.js',
stream_color: 'js/stream_color.js'
});

View File

@ -3,8 +3,6 @@ var assert = require('assert');
set_global('$', function () {});
add_dependencies({
_: 'third/underscore/underscore',
Dict: 'js/dict',
Handlebars: 'handlebars',
templates: 'js/templates',
muting: 'js/muting',

View File

@ -2,7 +2,6 @@ var assert = require('assert');
add_dependencies({
Handlebars: 'handlebars',
_: 'third/underscore/underscore',
templates: 'js/templates'
});

View File

@ -8,9 +8,7 @@
// dependencies (except _).
add_dependencies({
_: 'third/underscore/underscore.js',
muting: 'js/muting.js',
Dict: 'js/dict.js'
muting: 'js/muting.js'
});
var stream_data = require('js/stream_data.js');

View File

@ -1,7 +1,6 @@
var assert = require('assert');
add_dependencies({
_: 'third/underscore/underscore.js',
util: 'js/util.js'
});