diff --git a/zerver/tests/frontend/node/activity.js b/zerver/tests/frontend/node/activity.js index 2101dca8fc..bdc8786b5c 100644 --- a/zerver/tests/frontend/node/activity.js +++ b/zerver/tests/frontend/node/activity.js @@ -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' }); diff --git a/zerver/tests/frontend/node/alert_words.js b/zerver/tests/frontend/node/alert_words.js index ad766c7ec9..91baae9cbe 100644 --- a/zerver/tests/frontend/node/alert_words.js +++ b/zerver/tests/frontend/node/alert_words.js @@ -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' diff --git a/zerver/tests/frontend/node/composebox_typeahead.js b/zerver/tests/frontend/node/composebox_typeahead.js index d6149257a5..b8f10e980f 100644 --- a/zerver/tests/frontend/node/composebox_typeahead.js +++ b/zerver/tests/frontend/node/composebox_typeahead.js @@ -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"}, diff --git a/zerver/tests/frontend/node/dict.js b/zerver/tests/frontend/node/dict.js index 6961485211..cac803680e 100644 --- a/zerver/tests/frontend/node/dict.js +++ b/zerver/tests/frontend/node/dict.js @@ -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', {}); diff --git a/zerver/tests/frontend/node/echo.js b/zerver/tests/frontend/node/echo.js index 783ddb76a5..09ce0fa763 100644 --- a/zerver/tests/frontend/node/echo.js +++ b/zerver/tests/frontend/node/echo.js @@ -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' diff --git a/zerver/tests/frontend/node/filter.js b/zerver/tests/frontend/node/filter.js index 696cabfef4..f2b6a4b169 100644 --- a/zerver/tests/frontend/node/filter.js +++ b/zerver/tests/frontend/node/filter.js @@ -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' }); diff --git a/zerver/tests/frontend/node/index.js b/zerver/tests/frontend/node/index.js index d4a02fda59..028e32c3c4 100644 --- a/zerver/tests/frontend/node/index.js +++ b/zerver/tests/frontend/node/index.js @@ -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. diff --git a/zerver/tests/frontend/node/message_list.js b/zerver/tests/frontend/node/message_list.js index 28fff8733d..6d44b7473b 100644 --- a/zerver/tests/frontend/node/message_list.js +++ b/zerver/tests/frontend/node/message_list.js @@ -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' }); diff --git a/zerver/tests/frontend/node/muting.js b/zerver/tests/frontend/node/muting.js index 5f60ac5d4c..f04f36bee3 100644 --- a/zerver/tests/frontend/node/muting.js +++ b/zerver/tests/frontend/node/muting.js @@ -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' }); diff --git a/zerver/tests/frontend/node/narrow.js b/zerver/tests/frontend/node/narrow.js index bd2703d7e1..0a7088047e 100644 --- a/zerver/tests/frontend/node/narrow.js +++ b/zerver/tests/frontend/node/narrow.js @@ -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' }); diff --git a/zerver/tests/frontend/node/search_suggestion.js b/zerver/tests/frontend/node/search_suggestion.js index fc4127f0d5..a78c793bc2 100644 --- a/zerver/tests/frontend/node/search_suggestion.js +++ b/zerver/tests/frontend/node/search_suggestion.js @@ -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', diff --git a/zerver/tests/frontend/node/stream_color.js b/zerver/tests/frontend/node/stream_color.js index 37478282e5..2f2a112b4e 100644 --- a/zerver/tests/frontend/node/stream_color.js +++ b/zerver/tests/frontend/node/stream_color.js @@ -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'); diff --git a/zerver/tests/frontend/node/stream_data.js b/zerver/tests/frontend/node/stream_data.js index 8d059cfd38..2e1afc0f5e 100644 --- a/zerver/tests/frontend/node/stream_data.js +++ b/zerver/tests/frontend/node/stream_data.js @@ -1,8 +1,6 @@ var assert = require('assert'); add_dependencies({ - _: 'third/underscore/underscore.js', - Dict: 'js/dict.js', stream_color: 'js/stream_color.js' }); diff --git a/zerver/tests/frontend/node/stream_list.js b/zerver/tests/frontend/node/stream_list.js index 4f5a328f43..35b33c9293 100644 --- a/zerver/tests/frontend/node/stream_list.js +++ b/zerver/tests/frontend/node/stream_list.js @@ -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', diff --git a/zerver/tests/frontend/node/templates.js b/zerver/tests/frontend/node/templates.js index b288a92fe9..c7e04a7dd0 100644 --- a/zerver/tests/frontend/node/templates.js +++ b/zerver/tests/frontend/node/templates.js @@ -2,7 +2,6 @@ var assert = require('assert'); add_dependencies({ Handlebars: 'handlebars', - _: 'third/underscore/underscore', templates: 'js/templates' }); diff --git a/zerver/tests/frontend/node/unread.js b/zerver/tests/frontend/node/unread.js index dece7b3dd9..8a02bf46e2 100644 --- a/zerver/tests/frontend/node/unread.js +++ b/zerver/tests/frontend/node/unread.js @@ -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'); diff --git a/zerver/tests/frontend/node/util.js b/zerver/tests/frontend/node/util.js index 2ac2ff7edf..784c7d0276 100644 --- a/zerver/tests/frontend/node/util.js +++ b/zerver/tests/frontend/node/util.js @@ -1,7 +1,6 @@ var assert = require('assert'); add_dependencies({ - _: 'third/underscore/underscore.js', util: 'js/util.js' });