From 10657c1d539f6162549134e2bf85528d35c469b8 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 13 Oct 2015 18:35:47 -0400 Subject: [PATCH] Move node tests to node_tests/. --- docs/testing.rst | 2 +- frontend_tests/{node => node_tests}/activity.js | 0 frontend_tests/{node => node_tests}/alert_words.js | 0 frontend_tests/{node => node_tests}/bot_data.js | 0 frontend_tests/{node => node_tests}/composebox_typeahead.js | 0 frontend_tests/{node => node_tests}/dict.js | 0 frontend_tests/{node => node_tests}/echo.js | 0 frontend_tests/{node => node_tests}/filter.js | 0 frontend_tests/{node => node_tests}/hashchange.js | 0 frontend_tests/{node => node_tests}/index.js | 0 frontend_tests/{node => node_tests}/message_list.js | 0 frontend_tests/{node => node_tests}/message_list_view.js | 0 frontend_tests/{node => node_tests}/muting.js | 0 frontend_tests/{node => node_tests}/narrow.js | 0 frontend_tests/{node => node_tests}/people.js | 0 frontend_tests/{node => node_tests}/search_suggestion.js | 0 frontend_tests/{node => node_tests}/server_events.js | 0 frontend_tests/{node => node_tests}/stream_color.js | 0 frontend_tests/{node => node_tests}/stream_data.js | 0 frontend_tests/{node => node_tests}/stream_list.js | 0 frontend_tests/{node => node_tests}/templates.js | 0 frontend_tests/{node => node_tests}/unread.js | 0 frontend_tests/{node => node_tests}/util.js | 0 tools/test-js-with-node | 2 +- 24 files changed, 2 insertions(+), 2 deletions(-) rename frontend_tests/{node => node_tests}/activity.js (100%) rename frontend_tests/{node => node_tests}/alert_words.js (100%) rename frontend_tests/{node => node_tests}/bot_data.js (100%) rename frontend_tests/{node => node_tests}/composebox_typeahead.js (100%) rename frontend_tests/{node => node_tests}/dict.js (100%) rename frontend_tests/{node => node_tests}/echo.js (100%) rename frontend_tests/{node => node_tests}/filter.js (100%) rename frontend_tests/{node => node_tests}/hashchange.js (100%) rename frontend_tests/{node => node_tests}/index.js (100%) rename frontend_tests/{node => node_tests}/message_list.js (100%) rename frontend_tests/{node => node_tests}/message_list_view.js (100%) rename frontend_tests/{node => node_tests}/muting.js (100%) rename frontend_tests/{node => node_tests}/narrow.js (100%) rename frontend_tests/{node => node_tests}/people.js (100%) rename frontend_tests/{node => node_tests}/search_suggestion.js (100%) rename frontend_tests/{node => node_tests}/server_events.js (100%) rename frontend_tests/{node => node_tests}/stream_color.js (100%) rename frontend_tests/{node => node_tests}/stream_data.js (100%) rename frontend_tests/{node => node_tests}/stream_list.js (100%) rename frontend_tests/{node => node_tests}/templates.js (100%) rename frontend_tests/{node => node_tests}/unread.js (100%) rename frontend_tests/{node => node_tests}/util.js (100%) diff --git a/docs/testing.rst b/docs/testing.rst index b1b88b36a6..98f9234631 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -114,7 +114,7 @@ bottom of ``foobar.js``: This makes ``foobar.js`` follow the CommonJS module pattern, so it can be required in Node.js, which runs our tests. -Now create ``frontend_tests/node/foobar.js``. At the top, require +Now create ``frontend_tests/node_tests/foobar.js``. At the top, require the `Node.js assert module `__, and the module you're testing, like so: diff --git a/frontend_tests/node/activity.js b/frontend_tests/node_tests/activity.js similarity index 100% rename from frontend_tests/node/activity.js rename to frontend_tests/node_tests/activity.js diff --git a/frontend_tests/node/alert_words.js b/frontend_tests/node_tests/alert_words.js similarity index 100% rename from frontend_tests/node/alert_words.js rename to frontend_tests/node_tests/alert_words.js diff --git a/frontend_tests/node/bot_data.js b/frontend_tests/node_tests/bot_data.js similarity index 100% rename from frontend_tests/node/bot_data.js rename to frontend_tests/node_tests/bot_data.js diff --git a/frontend_tests/node/composebox_typeahead.js b/frontend_tests/node_tests/composebox_typeahead.js similarity index 100% rename from frontend_tests/node/composebox_typeahead.js rename to frontend_tests/node_tests/composebox_typeahead.js diff --git a/frontend_tests/node/dict.js b/frontend_tests/node_tests/dict.js similarity index 100% rename from frontend_tests/node/dict.js rename to frontend_tests/node_tests/dict.js diff --git a/frontend_tests/node/echo.js b/frontend_tests/node_tests/echo.js similarity index 100% rename from frontend_tests/node/echo.js rename to frontend_tests/node_tests/echo.js diff --git a/frontend_tests/node/filter.js b/frontend_tests/node_tests/filter.js similarity index 100% rename from frontend_tests/node/filter.js rename to frontend_tests/node_tests/filter.js diff --git a/frontend_tests/node/hashchange.js b/frontend_tests/node_tests/hashchange.js similarity index 100% rename from frontend_tests/node/hashchange.js rename to frontend_tests/node_tests/hashchange.js diff --git a/frontend_tests/node/index.js b/frontend_tests/node_tests/index.js similarity index 100% rename from frontend_tests/node/index.js rename to frontend_tests/node_tests/index.js diff --git a/frontend_tests/node/message_list.js b/frontend_tests/node_tests/message_list.js similarity index 100% rename from frontend_tests/node/message_list.js rename to frontend_tests/node_tests/message_list.js diff --git a/frontend_tests/node/message_list_view.js b/frontend_tests/node_tests/message_list_view.js similarity index 100% rename from frontend_tests/node/message_list_view.js rename to frontend_tests/node_tests/message_list_view.js diff --git a/frontend_tests/node/muting.js b/frontend_tests/node_tests/muting.js similarity index 100% rename from frontend_tests/node/muting.js rename to frontend_tests/node_tests/muting.js diff --git a/frontend_tests/node/narrow.js b/frontend_tests/node_tests/narrow.js similarity index 100% rename from frontend_tests/node/narrow.js rename to frontend_tests/node_tests/narrow.js diff --git a/frontend_tests/node/people.js b/frontend_tests/node_tests/people.js similarity index 100% rename from frontend_tests/node/people.js rename to frontend_tests/node_tests/people.js diff --git a/frontend_tests/node/search_suggestion.js b/frontend_tests/node_tests/search_suggestion.js similarity index 100% rename from frontend_tests/node/search_suggestion.js rename to frontend_tests/node_tests/search_suggestion.js diff --git a/frontend_tests/node/server_events.js b/frontend_tests/node_tests/server_events.js similarity index 100% rename from frontend_tests/node/server_events.js rename to frontend_tests/node_tests/server_events.js diff --git a/frontend_tests/node/stream_color.js b/frontend_tests/node_tests/stream_color.js similarity index 100% rename from frontend_tests/node/stream_color.js rename to frontend_tests/node_tests/stream_color.js diff --git a/frontend_tests/node/stream_data.js b/frontend_tests/node_tests/stream_data.js similarity index 100% rename from frontend_tests/node/stream_data.js rename to frontend_tests/node_tests/stream_data.js diff --git a/frontend_tests/node/stream_list.js b/frontend_tests/node_tests/stream_list.js similarity index 100% rename from frontend_tests/node/stream_list.js rename to frontend_tests/node_tests/stream_list.js diff --git a/frontend_tests/node/templates.js b/frontend_tests/node_tests/templates.js similarity index 100% rename from frontend_tests/node/templates.js rename to frontend_tests/node_tests/templates.js diff --git a/frontend_tests/node/unread.js b/frontend_tests/node_tests/unread.js similarity index 100% rename from frontend_tests/node/unread.js rename to frontend_tests/node_tests/unread.js diff --git a/frontend_tests/node/util.js b/frontend_tests/node_tests/util.js similarity index 100% rename from frontend_tests/node/util.js rename to frontend_tests/node_tests/util.js diff --git a/tools/test-js-with-node b/tools/test-js-with-node index 873029873b..90510e51ec 100755 --- a/tools/test-js-with-node +++ b/tools/test-js-with-node @@ -4,7 +4,7 @@ cd "$(dirname "$0")"/.. export NODE_PATH=/usr/lib/nodejs:static -INDEX_JS=frontend_tests/node/index.js +INDEX_JS=frontend_tests/node_tests/index.js NODEJS=$(which nodejs || which node) if [ "$1" = "cover" ]; then # Run a coverage test with Istanbul.