From f1074aa491b611deafedad5372b2da851ecbddfe Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 13 Oct 2015 17:34:50 -0400 Subject: [PATCH] Move frontend tests out of zerver/tests/. This fixes an unfortunate bug where the backend tests in zerver/tests.py were not being run automatically, and also makes these a bit easier to find. --- .gitattributes | 2 +- .gitignore | 2 +- THIRDPARTY | 4 ++-- docs/directory-structure.rst | 6 +++--- docs/testing.rst | 10 +++++----- .../tests/frontend => frontend_tests}/.gitignore | 0 .../casperjs/.gitignore | 0 .../casperjs/.gitmodules | 0 .../casperjs/.jshintconfig | 0 .../casperjs/.jshintignore | 0 .../casperjs/.travis.yml | 0 .../casperjs/CHANGELOG.md | 0 .../casperjs/CONTRIBUTING.md | 0 .../casperjs/CONTRIBUTORS.md | 0 .../casperjs/LICENSE.md | 0 .../frontend => frontend_tests}/casperjs/README.md | 0 .../casperjs/batchbin/casperjs.bat | 0 .../casperjs/bin/bootstrap.js | 0 .../casperjs/bin/casperjs | 0 .../casperjs/bin/usage.txt | 0 .../casperjs/casperjs.gemspec | 0 .../casperjs/modules/casper.js | 0 .../casperjs/modules/cli.js | 0 .../casperjs/modules/clientutils.js | 0 .../casperjs/modules/colorizer.js | 0 .../casperjs/modules/events.js | 0 .../casperjs/modules/http.js | 0 .../casperjs/modules/mouse.js | 0 .../casperjs/modules/pagestack.js | 0 .../casperjs/modules/querystring.js | 0 .../casperjs/modules/tester.js | 0 .../casperjs/modules/utils.js | 0 .../casperjs/modules/vendors/coffee-script.js | 0 .../casperjs/modules/xunit.js | 0 .../casperjs/package.json | 0 .../casperjs/rpm/casperjs.spec | 0 .../casperjs/rpm/mkrpm.sh | 0 .../casperjs/rubybin/casperjs | 0 .../casperjs/samples/bbcshots.coffee | 0 .../casperjs/samples/bbcshots.js | 0 .../casperjs/samples/cliplay.coffee | 0 .../casperjs/samples/cliplay.js | 0 .../casperjs/samples/customevents.coffee | 0 .../casperjs/samples/customevents.js | 0 .../casperjs/samples/customlogging.coffee | 0 .../casperjs/samples/customlogging.js | 0 .../casperjs/samples/download.coffee | 0 .../casperjs/samples/download.js | 0 .../casperjs/samples/dynamic.coffee | 0 .../casperjs/samples/dynamic.js | 0 .../casperjs/samples/each.coffee | 0 .../casperjs/samples/each.js | 0 .../casperjs/samples/events.coffee | 0 .../casperjs/samples/events.js | 0 .../casperjs/samples/extends.coffee | 0 .../casperjs/samples/extends.js | 0 .../casperjs/samples/googlelinks.coffee | 0 .../casperjs/samples/googlelinks.js | 0 .../casperjs/samples/googlematch.coffee | 0 .../casperjs/samples/googlematch.js | 0 .../casperjs/samples/googlepagination.coffee | 0 .../casperjs/samples/googlepagination.js | 0 .../casperjs/samples/googletesting.coffee | 0 .../casperjs/samples/googletesting.js | 0 .../casperjs/samples/logcolor.coffee | 0 .../casperjs/samples/logcolor.js | 0 .../casperjs/samples/metaextract.coffee | 0 .../casperjs/samples/metaextract.js | 0 .../casperjs/samples/multirun.coffee | 0 .../casperjs/samples/multirun.js | 0 .../casperjs/samples/screenshot.coffee | 0 .../casperjs/samples/screenshot.js | 0 .../casperjs/samples/statushandlers.coffee | 0 .../casperjs/samples/statushandlers.js | 0 .../casperjs/samples/steptimeout.coffee | 0 .../casperjs/samples/steptimeout.js | 0 .../casperjs/samples/timeout.coffee | 0 .../casperjs/samples/timeout.js | 0 .../casperjs/samples/translate.coffee | 0 .../casperjs/samples/translate.js | 0 .../casperjs/tests/commands/mytest.js | 0 .../casperjs/tests/commands/script.js | 0 .../casperjs/tests/run.js | 0 .../casperjs/tests/sample_modules/config.json | 0 .../casperjs/tests/sample_modules/csmodule.coffee | 0 .../casperjs/tests/sample_modules/jsmodule.js | 0 .../casperjs/tests/selftest.js | 0 .../casperjs/tests/site/alert.html | 0 .../casperjs/tests/site/click.html | 0 .../casperjs/tests/site/confirm.html | 0 .../casperjs/tests/site/dummy.js | 0 .../casperjs/tests/site/elementattribute.html | 0 .../casperjs/tests/site/error.html | 0 .../casperjs/tests/site/field-array.html | 0 .../casperjs/tests/site/form.html | 0 .../casperjs/tests/site/frame1.html | 0 .../casperjs/tests/site/frame2.html | 0 .../casperjs/tests/site/frame3.html | 0 .../casperjs/tests/site/frames.html | 0 .../casperjs/tests/site/global.html | 0 .../casperjs/tests/site/includes/include1.js | 0 .../casperjs/tests/site/includes/include2.js | 0 .../casperjs/tests/site/index.html | 0 .../casperjs/tests/site/mouse-events.html | 0 .../casperjs/tests/site/multiple-forms.html | 0 .../casperjs/tests/site/page1.html | 0 .../casperjs/tests/site/page2.html | 0 .../casperjs/tests/site/page3.html | 0 .../casperjs/tests/site/popup.html | 0 .../casperjs/tests/site/prompt.html | 0 .../casperjs/tests/site/resources.html | 0 .../casperjs/tests/site/result.html | 0 .../casperjs/tests/site/test.html | 0 .../casperjs/tests/site/urls.html | 0 .../casperjs/tests/site/visible.html | 0 .../casperjs/tests/site/waitFor.html | 0 .../casperjs/tests/suites/.casper | 0 .../casperjs/tests/suites/casper/.casper | 0 .../casperjs/tests/suites/casper/agent.js | 0 .../casperjs/tests/suites/casper/alert.js | 0 .../casperjs/tests/suites/casper/auth.js | 0 .../casperjs/tests/suites/casper/capture.js | 0 .../casperjs/tests/suites/casper/click.js | 0 .../casperjs/tests/suites/casper/confirm.js | 0 .../casperjs/tests/suites/casper/debug.js | 0 .../tests/suites/casper/elementattribute.js | 0 .../casperjs/tests/suites/casper/encode.js | 0 .../casperjs/tests/suites/casper/evaluate.js | 0 .../casperjs/tests/suites/casper/events.js | 0 .../casperjs/tests/suites/casper/exists.js | 0 .../casperjs/tests/suites/casper/fetchtext.js | 0 .../casperjs/tests/suites/casper/flow.coffee | 0 .../casperjs/tests/suites/casper/formfill.js | 0 .../casperjs/tests/suites/casper/frames.js | 0 .../casperjs/tests/suites/casper/global.js | 0 .../casperjs/tests/suites/casper/headers.js | 0 .../casperjs/tests/suites/casper/history.js | 0 .../casperjs/tests/suites/casper/hooks.js | 0 .../casperjs/tests/suites/casper/keys.js | 0 .../casperjs/tests/suites/casper/location.js | 0 .../casperjs/tests/suites/casper/logging.js | 0 .../casperjs/tests/suites/casper/mouseevents.js | 0 .../casperjs/tests/suites/casper/onerror.js | 0 .../casperjs/tests/suites/casper/open.js | 0 .../casperjs/tests/suites/casper/popup.js | 0 .../casperjs/tests/suites/casper/prompt.js | 0 .../casperjs/tests/suites/casper/request.js | 0 .../casperjs/tests/suites/casper/resources.coffee | 0 .../casperjs/tests/suites/casper/scripts.js | 0 .../casperjs/tests/suites/casper/start.js | 0 .../casperjs/tests/suites/casper/steps.js | 0 .../casperjs/tests/suites/casper/urls.js | 0 .../casperjs/tests/suites/casper/viewport.js | 0 .../casperjs/tests/suites/casper/visible.js | 0 .../casperjs/tests/suites/casper/wait.js | 0 .../casperjs/tests/suites/casper/xpath.js | 0 .../casperjs/tests/suites/cli.js | 0 .../casperjs/tests/suites/clientutils.js | 0 .../casperjs/tests/suites/coffee.coffee | 0 .../casperjs/tests/suites/fs.js | 0 .../casperjs/tests/suites/http_status.js | 0 .../casperjs/tests/suites/popup.js | 0 .../casperjs/tests/suites/require.js | 0 .../casperjs/tests/suites/tester.js | 0 .../casperjs/tests/suites/utils.js | 0 .../casperjs/tests/suites/xunit.js | 0 .../casperjs/tests/testdir/01_a/abc.js | 0 .../casperjs/tests/testdir/01_a/def.js | 0 .../casperjs/tests/testdir/02_b/abc.js | 0 .../casperjs/tests/testdir/03_a.js | 0 .../casperjs/tests/testdir/03_b.js | 0 .../casperjs/tests/testdir/04/01_init.js | 0 .../casperjs/tests/testdir/04/02_do.js | 0 .../tests/frontend => frontend_tests}/common.js | 0 .../frontend => frontend_tests}/node/activity.js | 0 .../node/alert_words.js | 0 .../frontend => frontend_tests}/node/bot_data.js | 0 .../node/composebox_typeahead.js | 0 .../tests/frontend => frontend_tests}/node/dict.js | 0 .../tests/frontend => frontend_tests}/node/echo.js | 2 +- .../frontend => frontend_tests}/node/filter.js | 0 .../frontend => frontend_tests}/node/hashchange.js | 0 .../frontend => frontend_tests}/node/index.js | 2 +- .../node/message_list.js | 0 .../node/message_list_view.js | 0 .../frontend => frontend_tests}/node/muting.js | 0 .../frontend => frontend_tests}/node/narrow.js | 0 .../frontend => frontend_tests}/node/people.js | 0 .../node/search_suggestion.js | 0 .../node/server_events.js | 0 .../node/stream_color.js | 0 .../node/stream_data.js | 0 .../node/stream_list.js | 0 .../frontend => frontend_tests}/node/templates.js | 0 .../frontend => frontend_tests}/node/unread.js | 0 .../tests/frontend => frontend_tests}/node/util.js | 0 {zerver/tests/frontend => frontend_tests}/run | 14 +++++++------- .../frontend => frontend_tests}/tests/00-login.js | 0 .../frontend => frontend_tests}/tests/01-site.js | 0 .../frontend => frontend_tests}/tests/02-narrow.js | 0 .../tests/03-compose.js | 0 .../tests/04-subscriptions.js | 0 .../tests/05-settings.js | 0 .../frontend => frontend_tests}/tests/07-stars.js | 0 .../frontend => frontend_tests}/tests/09-edit.js | 0 .../tests/10-navigation.js | 0 tools/generate-test-credentials | 2 +- tools/jslint/check-all.js | 2 +- tools/lint-all | 2 +- tools/test-js-with-casper | 2 +- tools/test-js-with-node | 2 +- 211 files changed, 26 insertions(+), 26 deletions(-) rename {zerver/tests/frontend => frontend_tests}/.gitignore (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/.gitignore (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/.gitmodules (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/.jshintconfig (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/.jshintignore (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/.travis.yml (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/CHANGELOG.md (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/CONTRIBUTING.md (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/CONTRIBUTORS.md (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/LICENSE.md (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/README.md (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/batchbin/casperjs.bat (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/bin/bootstrap.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/bin/casperjs (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/bin/usage.txt (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/casperjs.gemspec (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/casper.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/cli.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/clientutils.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/colorizer.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/events.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/http.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/mouse.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/pagestack.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/querystring.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/tester.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/utils.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/vendors/coffee-script.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/modules/xunit.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/package.json (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/rpm/casperjs.spec (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/rpm/mkrpm.sh (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/rubybin/casperjs (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/bbcshots.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/bbcshots.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/cliplay.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/cliplay.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/customevents.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/customevents.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/customlogging.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/customlogging.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/download.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/download.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/dynamic.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/dynamic.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/each.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/each.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/events.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/events.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/extends.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/extends.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlelinks.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlelinks.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlematch.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlematch.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlepagination.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googlepagination.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googletesting.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/googletesting.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/logcolor.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/logcolor.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/metaextract.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/metaextract.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/multirun.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/multirun.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/screenshot.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/screenshot.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/statushandlers.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/statushandlers.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/steptimeout.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/steptimeout.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/timeout.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/timeout.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/translate.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/samples/translate.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/commands/mytest.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/commands/script.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/run.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/sample_modules/config.json (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/sample_modules/csmodule.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/sample_modules/jsmodule.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/selftest.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/alert.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/click.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/confirm.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/dummy.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/elementattribute.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/error.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/field-array.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/form.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/frame1.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/frame2.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/frame3.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/frames.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/global.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/includes/include1.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/includes/include2.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/index.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/mouse-events.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/multiple-forms.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/page1.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/page2.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/page3.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/popup.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/prompt.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/resources.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/result.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/test.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/urls.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/visible.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/site/waitFor.html (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/.casper (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/.casper (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/agent.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/alert.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/auth.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/capture.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/click.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/confirm.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/debug.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/elementattribute.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/encode.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/evaluate.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/events.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/exists.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/fetchtext.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/flow.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/formfill.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/frames.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/global.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/headers.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/history.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/hooks.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/keys.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/location.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/logging.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/mouseevents.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/onerror.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/open.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/popup.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/prompt.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/request.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/resources.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/scripts.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/start.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/steps.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/urls.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/viewport.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/visible.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/wait.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/casper/xpath.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/cli.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/clientutils.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/coffee.coffee (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/fs.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/http_status.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/popup.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/require.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/tester.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/utils.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/suites/xunit.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/01_a/abc.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/01_a/def.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/02_b/abc.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/03_a.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/03_b.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/04/01_init.js (100%) rename {zerver/tests/frontend => frontend_tests}/casperjs/tests/testdir/04/02_do.js (100%) rename {zerver/tests/frontend => frontend_tests}/common.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/activity.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/alert_words.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/bot_data.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/composebox_typeahead.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/dict.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/echo.js (99%) rename {zerver/tests/frontend => frontend_tests}/node/filter.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/hashchange.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/index.js (98%) rename {zerver/tests/frontend => frontend_tests}/node/message_list.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/message_list_view.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/muting.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/narrow.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/people.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/search_suggestion.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/server_events.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/stream_color.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/stream_data.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/stream_list.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/templates.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/unread.js (100%) rename {zerver/tests/frontend => frontend_tests}/node/util.js (100%) rename {zerver/tests/frontend => frontend_tests}/run (84%) rename {zerver/tests/frontend => frontend_tests}/tests/00-login.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/01-site.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/02-narrow.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/03-compose.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/04-subscriptions.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/05-settings.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/07-stars.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/09-edit.js (100%) rename {zerver/tests/frontend => frontend_tests}/tests/10-navigation.js (100%) diff --git a/.gitattributes b/.gitattributes index 69b4198c83..b043e711aa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,6 @@ /zproject/test_settings.py export-ignore /zerver/fixtures export-ignore /zerver/tests.py export-ignore -/zerver/tests export-ignore +/frontend_tests export-ignore /node_modules export-ignore /humbug export-ignore diff --git a/.gitignore b/.gitignore index b1901638d8..5945112bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ stats/ zerver/fixtures/available-migrations zerver/fixtures/migration-status zerver/fixtures/test_data1.json -zerver/tests/frontend/test_credentials.js +frontend_tests/test_credentials.js .kdev4 zulip.kdev4 memcached_prefix diff --git a/THIRDPARTY b/THIRDPARTY index 632e836dad..ad83d1f63f 100644 --- a/THIRDPARTY +++ b/THIRDPARTY @@ -254,12 +254,12 @@ Files: zerver/lib/ccache.py Copyright: 2013 David Benjamin and Alan Huang License: Expat -Files: zerver/tests/frontend/casperjs/* +Files: frontend_tests/casperjs/* Copyright: 2011-2012 Nicolas Perriault Joyent, Inc. and other Node contributors License: Expat -Files: zerver/tests/frontend/casperjs/modules/vendors/* +Files: frontend_tests/casperjs/modules/vendors/* Copyright: 2011, Jeremy Ashkenas License: Expat diff --git a/docs/directory-structure.rst b/docs/directory-structure.rst index fa5a822e97..a3e475451c 100644 --- a/docs/directory-structure.rst +++ b/docs/directory-structure.rst @@ -76,11 +76,11 @@ Tests ===== +------------------------+-----------------------------------+ -| ``zerver/test*.py`` | Backend tests | | +| ``zerver/test*.py`` | Backend tests | +------------------------+-----------------------------------+ -| ``zerver/tests/frontend/node`` | Node Frontend unit tests | +| ``frontend_tests/node`` | Node Frontend unit tests | +------------------------+-----------------------------------+ -| ``zerver/tests/frontend/tests`` | Casper frontend tests | +| ``frontend_tests/tests`` | Casper frontend tests | +------------------------+-----------------------------------+ Documentation diff --git a/docs/testing.rst b/docs/testing.rst index 7ab1c9203b..b1b88b36a6 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -59,7 +59,7 @@ with ``tools/test-backend``. Web frontend black-box tests ---------------------------- -These live in ``zerver/tests/frontend/tests/``. This is a "black box" +These live in ``frontend_tests/tests/``. This is a "black box" test; we load the frontend in a real (headless) browser, from a real dev server, and simulate UI interactions like sending messages, narrowing, etc. @@ -67,7 +67,7 @@ etc. Since this is interacting with a real dev server, it can catch backend bugs as well. -You can run this with ``./zerver/tests/frontend/run``. You will need +You can run this with ``./frontend_tests/run``. You will need `PhantomJS `__ 1.7.0 or later. Debugging Casper.JS @@ -78,7 +78,7 @@ is not perfect. Here are some steps for using it and gotchas you might want to know. To turn on remote debugging, pass ``--remote-debug`` to the -``./zerver/frontend/tests/run`` script. This will run the tests with +``./frontend_tests/tests/run`` script. This will run the tests with port ``7777`` open for remote debugging. You can now connect to ``localhost:7777`` in a Webkit browser. Somewhat recent versions of Chrome or Safari might be required. @@ -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 ``zerver/tests/frontend/node/foobar.js``. At the top, require +Now create ``frontend_tests/node/foobar.js``. At the top, require the `Node.js assert module `__, and the module you're testing, like so: @@ -140,7 +140,7 @@ asserts, the *actual* value comes first, the *expected* value second. }()); The test runner (index.js) automatically runs all .js files in the -zerver/tests/frontend/node directory. +frontend_tests/node directory. .. _handling-dependencies: diff --git a/zerver/tests/frontend/.gitignore b/frontend_tests/.gitignore similarity index 100% rename from zerver/tests/frontend/.gitignore rename to frontend_tests/.gitignore diff --git a/zerver/tests/frontend/casperjs/.gitignore b/frontend_tests/casperjs/.gitignore similarity index 100% rename from zerver/tests/frontend/casperjs/.gitignore rename to frontend_tests/casperjs/.gitignore diff --git a/zerver/tests/frontend/casperjs/.gitmodules b/frontend_tests/casperjs/.gitmodules similarity index 100% rename from zerver/tests/frontend/casperjs/.gitmodules rename to frontend_tests/casperjs/.gitmodules diff --git a/zerver/tests/frontend/casperjs/.jshintconfig b/frontend_tests/casperjs/.jshintconfig similarity index 100% rename from zerver/tests/frontend/casperjs/.jshintconfig rename to frontend_tests/casperjs/.jshintconfig diff --git a/zerver/tests/frontend/casperjs/.jshintignore b/frontend_tests/casperjs/.jshintignore similarity index 100% rename from zerver/tests/frontend/casperjs/.jshintignore rename to frontend_tests/casperjs/.jshintignore diff --git a/zerver/tests/frontend/casperjs/.travis.yml b/frontend_tests/casperjs/.travis.yml similarity index 100% rename from zerver/tests/frontend/casperjs/.travis.yml rename to frontend_tests/casperjs/.travis.yml diff --git a/zerver/tests/frontend/casperjs/CHANGELOG.md b/frontend_tests/casperjs/CHANGELOG.md similarity index 100% rename from zerver/tests/frontend/casperjs/CHANGELOG.md rename to frontend_tests/casperjs/CHANGELOG.md diff --git a/zerver/tests/frontend/casperjs/CONTRIBUTING.md b/frontend_tests/casperjs/CONTRIBUTING.md similarity index 100% rename from zerver/tests/frontend/casperjs/CONTRIBUTING.md rename to frontend_tests/casperjs/CONTRIBUTING.md diff --git a/zerver/tests/frontend/casperjs/CONTRIBUTORS.md b/frontend_tests/casperjs/CONTRIBUTORS.md similarity index 100% rename from zerver/tests/frontend/casperjs/CONTRIBUTORS.md rename to frontend_tests/casperjs/CONTRIBUTORS.md diff --git a/zerver/tests/frontend/casperjs/LICENSE.md b/frontend_tests/casperjs/LICENSE.md similarity index 100% rename from zerver/tests/frontend/casperjs/LICENSE.md rename to frontend_tests/casperjs/LICENSE.md diff --git a/zerver/tests/frontend/casperjs/README.md b/frontend_tests/casperjs/README.md similarity index 100% rename from zerver/tests/frontend/casperjs/README.md rename to frontend_tests/casperjs/README.md diff --git a/zerver/tests/frontend/casperjs/batchbin/casperjs.bat b/frontend_tests/casperjs/batchbin/casperjs.bat similarity index 100% rename from zerver/tests/frontend/casperjs/batchbin/casperjs.bat rename to frontend_tests/casperjs/batchbin/casperjs.bat diff --git a/zerver/tests/frontend/casperjs/bin/bootstrap.js b/frontend_tests/casperjs/bin/bootstrap.js similarity index 100% rename from zerver/tests/frontend/casperjs/bin/bootstrap.js rename to frontend_tests/casperjs/bin/bootstrap.js diff --git a/zerver/tests/frontend/casperjs/bin/casperjs b/frontend_tests/casperjs/bin/casperjs similarity index 100% rename from zerver/tests/frontend/casperjs/bin/casperjs rename to frontend_tests/casperjs/bin/casperjs diff --git a/zerver/tests/frontend/casperjs/bin/usage.txt b/frontend_tests/casperjs/bin/usage.txt similarity index 100% rename from zerver/tests/frontend/casperjs/bin/usage.txt rename to frontend_tests/casperjs/bin/usage.txt diff --git a/zerver/tests/frontend/casperjs/casperjs.gemspec b/frontend_tests/casperjs/casperjs.gemspec similarity index 100% rename from zerver/tests/frontend/casperjs/casperjs.gemspec rename to frontend_tests/casperjs/casperjs.gemspec diff --git a/zerver/tests/frontend/casperjs/modules/casper.js b/frontend_tests/casperjs/modules/casper.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/casper.js rename to frontend_tests/casperjs/modules/casper.js diff --git a/zerver/tests/frontend/casperjs/modules/cli.js b/frontend_tests/casperjs/modules/cli.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/cli.js rename to frontend_tests/casperjs/modules/cli.js diff --git a/zerver/tests/frontend/casperjs/modules/clientutils.js b/frontend_tests/casperjs/modules/clientutils.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/clientutils.js rename to frontend_tests/casperjs/modules/clientutils.js diff --git a/zerver/tests/frontend/casperjs/modules/colorizer.js b/frontend_tests/casperjs/modules/colorizer.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/colorizer.js rename to frontend_tests/casperjs/modules/colorizer.js diff --git a/zerver/tests/frontend/casperjs/modules/events.js b/frontend_tests/casperjs/modules/events.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/events.js rename to frontend_tests/casperjs/modules/events.js diff --git a/zerver/tests/frontend/casperjs/modules/http.js b/frontend_tests/casperjs/modules/http.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/http.js rename to frontend_tests/casperjs/modules/http.js diff --git a/zerver/tests/frontend/casperjs/modules/mouse.js b/frontend_tests/casperjs/modules/mouse.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/mouse.js rename to frontend_tests/casperjs/modules/mouse.js diff --git a/zerver/tests/frontend/casperjs/modules/pagestack.js b/frontend_tests/casperjs/modules/pagestack.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/pagestack.js rename to frontend_tests/casperjs/modules/pagestack.js diff --git a/zerver/tests/frontend/casperjs/modules/querystring.js b/frontend_tests/casperjs/modules/querystring.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/querystring.js rename to frontend_tests/casperjs/modules/querystring.js diff --git a/zerver/tests/frontend/casperjs/modules/tester.js b/frontend_tests/casperjs/modules/tester.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/tester.js rename to frontend_tests/casperjs/modules/tester.js diff --git a/zerver/tests/frontend/casperjs/modules/utils.js b/frontend_tests/casperjs/modules/utils.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/utils.js rename to frontend_tests/casperjs/modules/utils.js diff --git a/zerver/tests/frontend/casperjs/modules/vendors/coffee-script.js b/frontend_tests/casperjs/modules/vendors/coffee-script.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/vendors/coffee-script.js rename to frontend_tests/casperjs/modules/vendors/coffee-script.js diff --git a/zerver/tests/frontend/casperjs/modules/xunit.js b/frontend_tests/casperjs/modules/xunit.js similarity index 100% rename from zerver/tests/frontend/casperjs/modules/xunit.js rename to frontend_tests/casperjs/modules/xunit.js diff --git a/zerver/tests/frontend/casperjs/package.json b/frontend_tests/casperjs/package.json similarity index 100% rename from zerver/tests/frontend/casperjs/package.json rename to frontend_tests/casperjs/package.json diff --git a/zerver/tests/frontend/casperjs/rpm/casperjs.spec b/frontend_tests/casperjs/rpm/casperjs.spec similarity index 100% rename from zerver/tests/frontend/casperjs/rpm/casperjs.spec rename to frontend_tests/casperjs/rpm/casperjs.spec diff --git a/zerver/tests/frontend/casperjs/rpm/mkrpm.sh b/frontend_tests/casperjs/rpm/mkrpm.sh similarity index 100% rename from zerver/tests/frontend/casperjs/rpm/mkrpm.sh rename to frontend_tests/casperjs/rpm/mkrpm.sh diff --git a/zerver/tests/frontend/casperjs/rubybin/casperjs b/frontend_tests/casperjs/rubybin/casperjs similarity index 100% rename from zerver/tests/frontend/casperjs/rubybin/casperjs rename to frontend_tests/casperjs/rubybin/casperjs diff --git a/zerver/tests/frontend/casperjs/samples/bbcshots.coffee b/frontend_tests/casperjs/samples/bbcshots.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/bbcshots.coffee rename to frontend_tests/casperjs/samples/bbcshots.coffee diff --git a/zerver/tests/frontend/casperjs/samples/bbcshots.js b/frontend_tests/casperjs/samples/bbcshots.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/bbcshots.js rename to frontend_tests/casperjs/samples/bbcshots.js diff --git a/zerver/tests/frontend/casperjs/samples/cliplay.coffee b/frontend_tests/casperjs/samples/cliplay.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/cliplay.coffee rename to frontend_tests/casperjs/samples/cliplay.coffee diff --git a/zerver/tests/frontend/casperjs/samples/cliplay.js b/frontend_tests/casperjs/samples/cliplay.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/cliplay.js rename to frontend_tests/casperjs/samples/cliplay.js diff --git a/zerver/tests/frontend/casperjs/samples/customevents.coffee b/frontend_tests/casperjs/samples/customevents.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/customevents.coffee rename to frontend_tests/casperjs/samples/customevents.coffee diff --git a/zerver/tests/frontend/casperjs/samples/customevents.js b/frontend_tests/casperjs/samples/customevents.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/customevents.js rename to frontend_tests/casperjs/samples/customevents.js diff --git a/zerver/tests/frontend/casperjs/samples/customlogging.coffee b/frontend_tests/casperjs/samples/customlogging.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/customlogging.coffee rename to frontend_tests/casperjs/samples/customlogging.coffee diff --git a/zerver/tests/frontend/casperjs/samples/customlogging.js b/frontend_tests/casperjs/samples/customlogging.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/customlogging.js rename to frontend_tests/casperjs/samples/customlogging.js diff --git a/zerver/tests/frontend/casperjs/samples/download.coffee b/frontend_tests/casperjs/samples/download.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/download.coffee rename to frontend_tests/casperjs/samples/download.coffee diff --git a/zerver/tests/frontend/casperjs/samples/download.js b/frontend_tests/casperjs/samples/download.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/download.js rename to frontend_tests/casperjs/samples/download.js diff --git a/zerver/tests/frontend/casperjs/samples/dynamic.coffee b/frontend_tests/casperjs/samples/dynamic.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/dynamic.coffee rename to frontend_tests/casperjs/samples/dynamic.coffee diff --git a/zerver/tests/frontend/casperjs/samples/dynamic.js b/frontend_tests/casperjs/samples/dynamic.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/dynamic.js rename to frontend_tests/casperjs/samples/dynamic.js diff --git a/zerver/tests/frontend/casperjs/samples/each.coffee b/frontend_tests/casperjs/samples/each.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/each.coffee rename to frontend_tests/casperjs/samples/each.coffee diff --git a/zerver/tests/frontend/casperjs/samples/each.js b/frontend_tests/casperjs/samples/each.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/each.js rename to frontend_tests/casperjs/samples/each.js diff --git a/zerver/tests/frontend/casperjs/samples/events.coffee b/frontend_tests/casperjs/samples/events.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/events.coffee rename to frontend_tests/casperjs/samples/events.coffee diff --git a/zerver/tests/frontend/casperjs/samples/events.js b/frontend_tests/casperjs/samples/events.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/events.js rename to frontend_tests/casperjs/samples/events.js diff --git a/zerver/tests/frontend/casperjs/samples/extends.coffee b/frontend_tests/casperjs/samples/extends.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/extends.coffee rename to frontend_tests/casperjs/samples/extends.coffee diff --git a/zerver/tests/frontend/casperjs/samples/extends.js b/frontend_tests/casperjs/samples/extends.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/extends.js rename to frontend_tests/casperjs/samples/extends.js diff --git a/zerver/tests/frontend/casperjs/samples/googlelinks.coffee b/frontend_tests/casperjs/samples/googlelinks.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlelinks.coffee rename to frontend_tests/casperjs/samples/googlelinks.coffee diff --git a/zerver/tests/frontend/casperjs/samples/googlelinks.js b/frontend_tests/casperjs/samples/googlelinks.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlelinks.js rename to frontend_tests/casperjs/samples/googlelinks.js diff --git a/zerver/tests/frontend/casperjs/samples/googlematch.coffee b/frontend_tests/casperjs/samples/googlematch.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlematch.coffee rename to frontend_tests/casperjs/samples/googlematch.coffee diff --git a/zerver/tests/frontend/casperjs/samples/googlematch.js b/frontend_tests/casperjs/samples/googlematch.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlematch.js rename to frontend_tests/casperjs/samples/googlematch.js diff --git a/zerver/tests/frontend/casperjs/samples/googlepagination.coffee b/frontend_tests/casperjs/samples/googlepagination.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlepagination.coffee rename to frontend_tests/casperjs/samples/googlepagination.coffee diff --git a/zerver/tests/frontend/casperjs/samples/googlepagination.js b/frontend_tests/casperjs/samples/googlepagination.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googlepagination.js rename to frontend_tests/casperjs/samples/googlepagination.js diff --git a/zerver/tests/frontend/casperjs/samples/googletesting.coffee b/frontend_tests/casperjs/samples/googletesting.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googletesting.coffee rename to frontend_tests/casperjs/samples/googletesting.coffee diff --git a/zerver/tests/frontend/casperjs/samples/googletesting.js b/frontend_tests/casperjs/samples/googletesting.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/googletesting.js rename to frontend_tests/casperjs/samples/googletesting.js diff --git a/zerver/tests/frontend/casperjs/samples/logcolor.coffee b/frontend_tests/casperjs/samples/logcolor.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/logcolor.coffee rename to frontend_tests/casperjs/samples/logcolor.coffee diff --git a/zerver/tests/frontend/casperjs/samples/logcolor.js b/frontend_tests/casperjs/samples/logcolor.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/logcolor.js rename to frontend_tests/casperjs/samples/logcolor.js diff --git a/zerver/tests/frontend/casperjs/samples/metaextract.coffee b/frontend_tests/casperjs/samples/metaextract.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/metaextract.coffee rename to frontend_tests/casperjs/samples/metaextract.coffee diff --git a/zerver/tests/frontend/casperjs/samples/metaextract.js b/frontend_tests/casperjs/samples/metaextract.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/metaextract.js rename to frontend_tests/casperjs/samples/metaextract.js diff --git a/zerver/tests/frontend/casperjs/samples/multirun.coffee b/frontend_tests/casperjs/samples/multirun.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/multirun.coffee rename to frontend_tests/casperjs/samples/multirun.coffee diff --git a/zerver/tests/frontend/casperjs/samples/multirun.js b/frontend_tests/casperjs/samples/multirun.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/multirun.js rename to frontend_tests/casperjs/samples/multirun.js diff --git a/zerver/tests/frontend/casperjs/samples/screenshot.coffee b/frontend_tests/casperjs/samples/screenshot.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/screenshot.coffee rename to frontend_tests/casperjs/samples/screenshot.coffee diff --git a/zerver/tests/frontend/casperjs/samples/screenshot.js b/frontend_tests/casperjs/samples/screenshot.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/screenshot.js rename to frontend_tests/casperjs/samples/screenshot.js diff --git a/zerver/tests/frontend/casperjs/samples/statushandlers.coffee b/frontend_tests/casperjs/samples/statushandlers.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/statushandlers.coffee rename to frontend_tests/casperjs/samples/statushandlers.coffee diff --git a/zerver/tests/frontend/casperjs/samples/statushandlers.js b/frontend_tests/casperjs/samples/statushandlers.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/statushandlers.js rename to frontend_tests/casperjs/samples/statushandlers.js diff --git a/zerver/tests/frontend/casperjs/samples/steptimeout.coffee b/frontend_tests/casperjs/samples/steptimeout.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/steptimeout.coffee rename to frontend_tests/casperjs/samples/steptimeout.coffee diff --git a/zerver/tests/frontend/casperjs/samples/steptimeout.js b/frontend_tests/casperjs/samples/steptimeout.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/steptimeout.js rename to frontend_tests/casperjs/samples/steptimeout.js diff --git a/zerver/tests/frontend/casperjs/samples/timeout.coffee b/frontend_tests/casperjs/samples/timeout.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/timeout.coffee rename to frontend_tests/casperjs/samples/timeout.coffee diff --git a/zerver/tests/frontend/casperjs/samples/timeout.js b/frontend_tests/casperjs/samples/timeout.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/timeout.js rename to frontend_tests/casperjs/samples/timeout.js diff --git a/zerver/tests/frontend/casperjs/samples/translate.coffee b/frontend_tests/casperjs/samples/translate.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/samples/translate.coffee rename to frontend_tests/casperjs/samples/translate.coffee diff --git a/zerver/tests/frontend/casperjs/samples/translate.js b/frontend_tests/casperjs/samples/translate.js similarity index 100% rename from zerver/tests/frontend/casperjs/samples/translate.js rename to frontend_tests/casperjs/samples/translate.js diff --git a/zerver/tests/frontend/casperjs/tests/commands/mytest.js b/frontend_tests/casperjs/tests/commands/mytest.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/commands/mytest.js rename to frontend_tests/casperjs/tests/commands/mytest.js diff --git a/zerver/tests/frontend/casperjs/tests/commands/script.js b/frontend_tests/casperjs/tests/commands/script.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/commands/script.js rename to frontend_tests/casperjs/tests/commands/script.js diff --git a/zerver/tests/frontend/casperjs/tests/run.js b/frontend_tests/casperjs/tests/run.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/run.js rename to frontend_tests/casperjs/tests/run.js diff --git a/zerver/tests/frontend/casperjs/tests/sample_modules/config.json b/frontend_tests/casperjs/tests/sample_modules/config.json similarity index 100% rename from zerver/tests/frontend/casperjs/tests/sample_modules/config.json rename to frontend_tests/casperjs/tests/sample_modules/config.json diff --git a/zerver/tests/frontend/casperjs/tests/sample_modules/csmodule.coffee b/frontend_tests/casperjs/tests/sample_modules/csmodule.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/tests/sample_modules/csmodule.coffee rename to frontend_tests/casperjs/tests/sample_modules/csmodule.coffee diff --git a/zerver/tests/frontend/casperjs/tests/sample_modules/jsmodule.js b/frontend_tests/casperjs/tests/sample_modules/jsmodule.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/sample_modules/jsmodule.js rename to frontend_tests/casperjs/tests/sample_modules/jsmodule.js diff --git a/zerver/tests/frontend/casperjs/tests/selftest.js b/frontend_tests/casperjs/tests/selftest.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/selftest.js rename to frontend_tests/casperjs/tests/selftest.js diff --git a/zerver/tests/frontend/casperjs/tests/site/alert.html b/frontend_tests/casperjs/tests/site/alert.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/alert.html rename to frontend_tests/casperjs/tests/site/alert.html diff --git a/zerver/tests/frontend/casperjs/tests/site/click.html b/frontend_tests/casperjs/tests/site/click.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/click.html rename to frontend_tests/casperjs/tests/site/click.html diff --git a/zerver/tests/frontend/casperjs/tests/site/confirm.html b/frontend_tests/casperjs/tests/site/confirm.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/confirm.html rename to frontend_tests/casperjs/tests/site/confirm.html diff --git a/zerver/tests/frontend/casperjs/tests/site/dummy.js b/frontend_tests/casperjs/tests/site/dummy.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/dummy.js rename to frontend_tests/casperjs/tests/site/dummy.js diff --git a/zerver/tests/frontend/casperjs/tests/site/elementattribute.html b/frontend_tests/casperjs/tests/site/elementattribute.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/elementattribute.html rename to frontend_tests/casperjs/tests/site/elementattribute.html diff --git a/zerver/tests/frontend/casperjs/tests/site/error.html b/frontend_tests/casperjs/tests/site/error.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/error.html rename to frontend_tests/casperjs/tests/site/error.html diff --git a/zerver/tests/frontend/casperjs/tests/site/field-array.html b/frontend_tests/casperjs/tests/site/field-array.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/field-array.html rename to frontend_tests/casperjs/tests/site/field-array.html diff --git a/zerver/tests/frontend/casperjs/tests/site/form.html b/frontend_tests/casperjs/tests/site/form.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/form.html rename to frontend_tests/casperjs/tests/site/form.html diff --git a/zerver/tests/frontend/casperjs/tests/site/frame1.html b/frontend_tests/casperjs/tests/site/frame1.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/frame1.html rename to frontend_tests/casperjs/tests/site/frame1.html diff --git a/zerver/tests/frontend/casperjs/tests/site/frame2.html b/frontend_tests/casperjs/tests/site/frame2.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/frame2.html rename to frontend_tests/casperjs/tests/site/frame2.html diff --git a/zerver/tests/frontend/casperjs/tests/site/frame3.html b/frontend_tests/casperjs/tests/site/frame3.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/frame3.html rename to frontend_tests/casperjs/tests/site/frame3.html diff --git a/zerver/tests/frontend/casperjs/tests/site/frames.html b/frontend_tests/casperjs/tests/site/frames.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/frames.html rename to frontend_tests/casperjs/tests/site/frames.html diff --git a/zerver/tests/frontend/casperjs/tests/site/global.html b/frontend_tests/casperjs/tests/site/global.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/global.html rename to frontend_tests/casperjs/tests/site/global.html diff --git a/zerver/tests/frontend/casperjs/tests/site/includes/include1.js b/frontend_tests/casperjs/tests/site/includes/include1.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/includes/include1.js rename to frontend_tests/casperjs/tests/site/includes/include1.js diff --git a/zerver/tests/frontend/casperjs/tests/site/includes/include2.js b/frontend_tests/casperjs/tests/site/includes/include2.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/includes/include2.js rename to frontend_tests/casperjs/tests/site/includes/include2.js diff --git a/zerver/tests/frontend/casperjs/tests/site/index.html b/frontend_tests/casperjs/tests/site/index.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/index.html rename to frontend_tests/casperjs/tests/site/index.html diff --git a/zerver/tests/frontend/casperjs/tests/site/mouse-events.html b/frontend_tests/casperjs/tests/site/mouse-events.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/mouse-events.html rename to frontend_tests/casperjs/tests/site/mouse-events.html diff --git a/zerver/tests/frontend/casperjs/tests/site/multiple-forms.html b/frontend_tests/casperjs/tests/site/multiple-forms.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/multiple-forms.html rename to frontend_tests/casperjs/tests/site/multiple-forms.html diff --git a/zerver/tests/frontend/casperjs/tests/site/page1.html b/frontend_tests/casperjs/tests/site/page1.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/page1.html rename to frontend_tests/casperjs/tests/site/page1.html diff --git a/zerver/tests/frontend/casperjs/tests/site/page2.html b/frontend_tests/casperjs/tests/site/page2.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/page2.html rename to frontend_tests/casperjs/tests/site/page2.html diff --git a/zerver/tests/frontend/casperjs/tests/site/page3.html b/frontend_tests/casperjs/tests/site/page3.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/page3.html rename to frontend_tests/casperjs/tests/site/page3.html diff --git a/zerver/tests/frontend/casperjs/tests/site/popup.html b/frontend_tests/casperjs/tests/site/popup.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/popup.html rename to frontend_tests/casperjs/tests/site/popup.html diff --git a/zerver/tests/frontend/casperjs/tests/site/prompt.html b/frontend_tests/casperjs/tests/site/prompt.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/prompt.html rename to frontend_tests/casperjs/tests/site/prompt.html diff --git a/zerver/tests/frontend/casperjs/tests/site/resources.html b/frontend_tests/casperjs/tests/site/resources.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/resources.html rename to frontend_tests/casperjs/tests/site/resources.html diff --git a/zerver/tests/frontend/casperjs/tests/site/result.html b/frontend_tests/casperjs/tests/site/result.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/result.html rename to frontend_tests/casperjs/tests/site/result.html diff --git a/zerver/tests/frontend/casperjs/tests/site/test.html b/frontend_tests/casperjs/tests/site/test.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/test.html rename to frontend_tests/casperjs/tests/site/test.html diff --git a/zerver/tests/frontend/casperjs/tests/site/urls.html b/frontend_tests/casperjs/tests/site/urls.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/urls.html rename to frontend_tests/casperjs/tests/site/urls.html diff --git a/zerver/tests/frontend/casperjs/tests/site/visible.html b/frontend_tests/casperjs/tests/site/visible.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/visible.html rename to frontend_tests/casperjs/tests/site/visible.html diff --git a/zerver/tests/frontend/casperjs/tests/site/waitFor.html b/frontend_tests/casperjs/tests/site/waitFor.html similarity index 100% rename from zerver/tests/frontend/casperjs/tests/site/waitFor.html rename to frontend_tests/casperjs/tests/site/waitFor.html diff --git a/zerver/tests/frontend/casperjs/tests/suites/.casper b/frontend_tests/casperjs/tests/suites/.casper similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/.casper rename to frontend_tests/casperjs/tests/suites/.casper diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/.casper b/frontend_tests/casperjs/tests/suites/casper/.casper similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/.casper rename to frontend_tests/casperjs/tests/suites/casper/.casper diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/agent.js b/frontend_tests/casperjs/tests/suites/casper/agent.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/agent.js rename to frontend_tests/casperjs/tests/suites/casper/agent.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/alert.js b/frontend_tests/casperjs/tests/suites/casper/alert.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/alert.js rename to frontend_tests/casperjs/tests/suites/casper/alert.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/auth.js b/frontend_tests/casperjs/tests/suites/casper/auth.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/auth.js rename to frontend_tests/casperjs/tests/suites/casper/auth.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/capture.js b/frontend_tests/casperjs/tests/suites/casper/capture.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/capture.js rename to frontend_tests/casperjs/tests/suites/casper/capture.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/click.js b/frontend_tests/casperjs/tests/suites/casper/click.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/click.js rename to frontend_tests/casperjs/tests/suites/casper/click.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/confirm.js b/frontend_tests/casperjs/tests/suites/casper/confirm.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/confirm.js rename to frontend_tests/casperjs/tests/suites/casper/confirm.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/debug.js b/frontend_tests/casperjs/tests/suites/casper/debug.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/debug.js rename to frontend_tests/casperjs/tests/suites/casper/debug.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/elementattribute.js b/frontend_tests/casperjs/tests/suites/casper/elementattribute.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/elementattribute.js rename to frontend_tests/casperjs/tests/suites/casper/elementattribute.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/encode.js b/frontend_tests/casperjs/tests/suites/casper/encode.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/encode.js rename to frontend_tests/casperjs/tests/suites/casper/encode.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/evaluate.js b/frontend_tests/casperjs/tests/suites/casper/evaluate.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/evaluate.js rename to frontend_tests/casperjs/tests/suites/casper/evaluate.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/events.js b/frontend_tests/casperjs/tests/suites/casper/events.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/events.js rename to frontend_tests/casperjs/tests/suites/casper/events.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/exists.js b/frontend_tests/casperjs/tests/suites/casper/exists.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/exists.js rename to frontend_tests/casperjs/tests/suites/casper/exists.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/fetchtext.js b/frontend_tests/casperjs/tests/suites/casper/fetchtext.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/fetchtext.js rename to frontend_tests/casperjs/tests/suites/casper/fetchtext.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/flow.coffee b/frontend_tests/casperjs/tests/suites/casper/flow.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/flow.coffee rename to frontend_tests/casperjs/tests/suites/casper/flow.coffee diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/formfill.js b/frontend_tests/casperjs/tests/suites/casper/formfill.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/formfill.js rename to frontend_tests/casperjs/tests/suites/casper/formfill.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/frames.js b/frontend_tests/casperjs/tests/suites/casper/frames.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/frames.js rename to frontend_tests/casperjs/tests/suites/casper/frames.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/global.js b/frontend_tests/casperjs/tests/suites/casper/global.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/global.js rename to frontend_tests/casperjs/tests/suites/casper/global.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/headers.js b/frontend_tests/casperjs/tests/suites/casper/headers.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/headers.js rename to frontend_tests/casperjs/tests/suites/casper/headers.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/history.js b/frontend_tests/casperjs/tests/suites/casper/history.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/history.js rename to frontend_tests/casperjs/tests/suites/casper/history.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/hooks.js b/frontend_tests/casperjs/tests/suites/casper/hooks.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/hooks.js rename to frontend_tests/casperjs/tests/suites/casper/hooks.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/keys.js b/frontend_tests/casperjs/tests/suites/casper/keys.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/keys.js rename to frontend_tests/casperjs/tests/suites/casper/keys.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/location.js b/frontend_tests/casperjs/tests/suites/casper/location.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/location.js rename to frontend_tests/casperjs/tests/suites/casper/location.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/logging.js b/frontend_tests/casperjs/tests/suites/casper/logging.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/logging.js rename to frontend_tests/casperjs/tests/suites/casper/logging.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/mouseevents.js b/frontend_tests/casperjs/tests/suites/casper/mouseevents.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/mouseevents.js rename to frontend_tests/casperjs/tests/suites/casper/mouseevents.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/onerror.js b/frontend_tests/casperjs/tests/suites/casper/onerror.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/onerror.js rename to frontend_tests/casperjs/tests/suites/casper/onerror.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/open.js b/frontend_tests/casperjs/tests/suites/casper/open.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/open.js rename to frontend_tests/casperjs/tests/suites/casper/open.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/popup.js b/frontend_tests/casperjs/tests/suites/casper/popup.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/popup.js rename to frontend_tests/casperjs/tests/suites/casper/popup.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/prompt.js b/frontend_tests/casperjs/tests/suites/casper/prompt.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/prompt.js rename to frontend_tests/casperjs/tests/suites/casper/prompt.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/request.js b/frontend_tests/casperjs/tests/suites/casper/request.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/request.js rename to frontend_tests/casperjs/tests/suites/casper/request.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/resources.coffee b/frontend_tests/casperjs/tests/suites/casper/resources.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/resources.coffee rename to frontend_tests/casperjs/tests/suites/casper/resources.coffee diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/scripts.js b/frontend_tests/casperjs/tests/suites/casper/scripts.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/scripts.js rename to frontend_tests/casperjs/tests/suites/casper/scripts.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/start.js b/frontend_tests/casperjs/tests/suites/casper/start.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/start.js rename to frontend_tests/casperjs/tests/suites/casper/start.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/steps.js b/frontend_tests/casperjs/tests/suites/casper/steps.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/steps.js rename to frontend_tests/casperjs/tests/suites/casper/steps.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/urls.js b/frontend_tests/casperjs/tests/suites/casper/urls.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/urls.js rename to frontend_tests/casperjs/tests/suites/casper/urls.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/viewport.js b/frontend_tests/casperjs/tests/suites/casper/viewport.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/viewport.js rename to frontend_tests/casperjs/tests/suites/casper/viewport.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/visible.js b/frontend_tests/casperjs/tests/suites/casper/visible.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/visible.js rename to frontend_tests/casperjs/tests/suites/casper/visible.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/wait.js b/frontend_tests/casperjs/tests/suites/casper/wait.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/wait.js rename to frontend_tests/casperjs/tests/suites/casper/wait.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/casper/xpath.js b/frontend_tests/casperjs/tests/suites/casper/xpath.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/casper/xpath.js rename to frontend_tests/casperjs/tests/suites/casper/xpath.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/cli.js b/frontend_tests/casperjs/tests/suites/cli.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/cli.js rename to frontend_tests/casperjs/tests/suites/cli.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/clientutils.js b/frontend_tests/casperjs/tests/suites/clientutils.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/clientutils.js rename to frontend_tests/casperjs/tests/suites/clientutils.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/coffee.coffee b/frontend_tests/casperjs/tests/suites/coffee.coffee similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/coffee.coffee rename to frontend_tests/casperjs/tests/suites/coffee.coffee diff --git a/zerver/tests/frontend/casperjs/tests/suites/fs.js b/frontend_tests/casperjs/tests/suites/fs.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/fs.js rename to frontend_tests/casperjs/tests/suites/fs.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/http_status.js b/frontend_tests/casperjs/tests/suites/http_status.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/http_status.js rename to frontend_tests/casperjs/tests/suites/http_status.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/popup.js b/frontend_tests/casperjs/tests/suites/popup.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/popup.js rename to frontend_tests/casperjs/tests/suites/popup.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/require.js b/frontend_tests/casperjs/tests/suites/require.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/require.js rename to frontend_tests/casperjs/tests/suites/require.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/tester.js b/frontend_tests/casperjs/tests/suites/tester.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/tester.js rename to frontend_tests/casperjs/tests/suites/tester.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/utils.js b/frontend_tests/casperjs/tests/suites/utils.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/utils.js rename to frontend_tests/casperjs/tests/suites/utils.js diff --git a/zerver/tests/frontend/casperjs/tests/suites/xunit.js b/frontend_tests/casperjs/tests/suites/xunit.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/suites/xunit.js rename to frontend_tests/casperjs/tests/suites/xunit.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/01_a/abc.js b/frontend_tests/casperjs/tests/testdir/01_a/abc.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/01_a/abc.js rename to frontend_tests/casperjs/tests/testdir/01_a/abc.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/01_a/def.js b/frontend_tests/casperjs/tests/testdir/01_a/def.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/01_a/def.js rename to frontend_tests/casperjs/tests/testdir/01_a/def.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/02_b/abc.js b/frontend_tests/casperjs/tests/testdir/02_b/abc.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/02_b/abc.js rename to frontend_tests/casperjs/tests/testdir/02_b/abc.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/03_a.js b/frontend_tests/casperjs/tests/testdir/03_a.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/03_a.js rename to frontend_tests/casperjs/tests/testdir/03_a.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/03_b.js b/frontend_tests/casperjs/tests/testdir/03_b.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/03_b.js rename to frontend_tests/casperjs/tests/testdir/03_b.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/04/01_init.js b/frontend_tests/casperjs/tests/testdir/04/01_init.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/04/01_init.js rename to frontend_tests/casperjs/tests/testdir/04/01_init.js diff --git a/zerver/tests/frontend/casperjs/tests/testdir/04/02_do.js b/frontend_tests/casperjs/tests/testdir/04/02_do.js similarity index 100% rename from zerver/tests/frontend/casperjs/tests/testdir/04/02_do.js rename to frontend_tests/casperjs/tests/testdir/04/02_do.js diff --git a/zerver/tests/frontend/common.js b/frontend_tests/common.js similarity index 100% rename from zerver/tests/frontend/common.js rename to frontend_tests/common.js diff --git a/zerver/tests/frontend/node/activity.js b/frontend_tests/node/activity.js similarity index 100% rename from zerver/tests/frontend/node/activity.js rename to frontend_tests/node/activity.js diff --git a/zerver/tests/frontend/node/alert_words.js b/frontend_tests/node/alert_words.js similarity index 100% rename from zerver/tests/frontend/node/alert_words.js rename to frontend_tests/node/alert_words.js diff --git a/zerver/tests/frontend/node/bot_data.js b/frontend_tests/node/bot_data.js similarity index 100% rename from zerver/tests/frontend/node/bot_data.js rename to frontend_tests/node/bot_data.js diff --git a/zerver/tests/frontend/node/composebox_typeahead.js b/frontend_tests/node/composebox_typeahead.js similarity index 100% rename from zerver/tests/frontend/node/composebox_typeahead.js rename to frontend_tests/node/composebox_typeahead.js diff --git a/zerver/tests/frontend/node/dict.js b/frontend_tests/node/dict.js similarity index 100% rename from zerver/tests/frontend/node/dict.js rename to frontend_tests/node/dict.js diff --git a/zerver/tests/frontend/node/echo.js b/frontend_tests/node/echo.js similarity index 99% rename from zerver/tests/frontend/node/echo.js rename to frontend_tests/node/echo.js index 19b9c08ab2..e58da0ea69 100644 --- a/zerver/tests/frontend/node/echo.js +++ b/frontend_tests/node/echo.js @@ -40,7 +40,7 @@ people.test_set_people_name_dict({'Cordelia Lear': {full_name: 'Cordelia Lear', var echo = require('js/echo.js'); -var bugdown_data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../fixtures/bugdown-data.json'), 'utf8', 'r')); +var bugdown_data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../zerver/fixtures/bugdown-data.json'), 'utf8', 'r')); (function test_bugdown_detection() { diff --git a/zerver/tests/frontend/node/filter.js b/frontend_tests/node/filter.js similarity index 100% rename from zerver/tests/frontend/node/filter.js rename to frontend_tests/node/filter.js diff --git a/zerver/tests/frontend/node/hashchange.js b/frontend_tests/node/hashchange.js similarity index 100% rename from zerver/tests/frontend/node/hashchange.js rename to frontend_tests/node/hashchange.js diff --git a/zerver/tests/frontend/node/index.js b/frontend_tests/node/index.js similarity index 98% rename from zerver/tests/frontend/node/index.js rename to frontend_tests/node/index.js index c668da01b7..a25bfa3940 100644 --- a/zerver/tests/frontend/node/index.js +++ b/frontend_tests/node/index.js @@ -39,7 +39,7 @@ global.add_dependencies = function (dct) { }; function template_dir() { - return __dirname + '/../../../../static/templates/'; + return __dirname + '/../../static/templates/'; } global.make_sure_all_templates_have_been_compiled = function () { diff --git a/zerver/tests/frontend/node/message_list.js b/frontend_tests/node/message_list.js similarity index 100% rename from zerver/tests/frontend/node/message_list.js rename to frontend_tests/node/message_list.js diff --git a/zerver/tests/frontend/node/message_list_view.js b/frontend_tests/node/message_list_view.js similarity index 100% rename from zerver/tests/frontend/node/message_list_view.js rename to frontend_tests/node/message_list_view.js diff --git a/zerver/tests/frontend/node/muting.js b/frontend_tests/node/muting.js similarity index 100% rename from zerver/tests/frontend/node/muting.js rename to frontend_tests/node/muting.js diff --git a/zerver/tests/frontend/node/narrow.js b/frontend_tests/node/narrow.js similarity index 100% rename from zerver/tests/frontend/node/narrow.js rename to frontend_tests/node/narrow.js diff --git a/zerver/tests/frontend/node/people.js b/frontend_tests/node/people.js similarity index 100% rename from zerver/tests/frontend/node/people.js rename to frontend_tests/node/people.js diff --git a/zerver/tests/frontend/node/search_suggestion.js b/frontend_tests/node/search_suggestion.js similarity index 100% rename from zerver/tests/frontend/node/search_suggestion.js rename to frontend_tests/node/search_suggestion.js diff --git a/zerver/tests/frontend/node/server_events.js b/frontend_tests/node/server_events.js similarity index 100% rename from zerver/tests/frontend/node/server_events.js rename to frontend_tests/node/server_events.js diff --git a/zerver/tests/frontend/node/stream_color.js b/frontend_tests/node/stream_color.js similarity index 100% rename from zerver/tests/frontend/node/stream_color.js rename to frontend_tests/node/stream_color.js diff --git a/zerver/tests/frontend/node/stream_data.js b/frontend_tests/node/stream_data.js similarity index 100% rename from zerver/tests/frontend/node/stream_data.js rename to frontend_tests/node/stream_data.js diff --git a/zerver/tests/frontend/node/stream_list.js b/frontend_tests/node/stream_list.js similarity index 100% rename from zerver/tests/frontend/node/stream_list.js rename to frontend_tests/node/stream_list.js diff --git a/zerver/tests/frontend/node/templates.js b/frontend_tests/node/templates.js similarity index 100% rename from zerver/tests/frontend/node/templates.js rename to frontend_tests/node/templates.js diff --git a/zerver/tests/frontend/node/unread.js b/frontend_tests/node/unread.js similarity index 100% rename from zerver/tests/frontend/node/unread.js rename to frontend_tests/node/unread.js diff --git a/zerver/tests/frontend/node/util.js b/frontend_tests/node/util.js similarity index 100% rename from zerver/tests/frontend/node/util.js rename to frontend_tests/node/util.js diff --git a/zerver/tests/frontend/run b/frontend_tests/run similarity index 84% rename from zerver/tests/frontend/run rename to frontend_tests/run index 60f05da7ff..aea0b2d41c 100755 --- a/zerver/tests/frontend/run +++ b/frontend_tests/run @@ -30,10 +30,10 @@ parser.add_option('--remote-debug', test_files = [] for file in args: if not os.path.exists(file): - file = os.path.join(os.path.dirname(__file__), '../zerver/tests/frontend/tests', file) + file = os.path.join(os.path.dirname(__file__), '../frontend_tests/tests', file) test_files.append(os.path.abspath(file)) -os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../..')) +os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) subprocess.check_call('tools/generate-fixtures') @@ -41,7 +41,7 @@ subprocess.check_call('tools/generate-test-credentials') subprocess.check_call(['rm', '-f'] + glob.glob('/tmp/casper-failure*.png')) -log = open('zerver/tests/frontend/server.log', 'w') +log = open('frontend_tests/server.log', 'w') # Run this not through the shell, so that we have the actual PID. server = subprocess.Popen(('tools/run-dev.py', '--test'), @@ -50,7 +50,7 @@ server = subprocess.Popen(('tools/run-dev.py', '--test'), def assert_server_running(): # Get the exit code of the server, or None if it is still running. if server.poll() is not None: - raise RuntimeError, 'Server died unexpectedly! Check zerver/tests/frontend/server.log' + raise RuntimeError, 'Server died unexpectedly! Check frontend_tests/server.log' def server_is_up(): assert_server_running() @@ -74,12 +74,12 @@ try: remote_debug = "" if options.remote_debug: remote_debug = "--remote-debugger-port=7777 --remote-debugger-autorun=yes" - cmd = "zerver/tests/frontend/casperjs/bin/casperjs %s test " % (remote_debug,) + cmd = "frontend_tests/casperjs/bin/casperjs %s test " % (remote_debug,) if test_files: cmd += ' '.join(test_files) else: - cmd += 'zerver/tests/frontend/tests' + cmd += 'frontend_tests/tests' print "Running %s" % (cmd,) ret = subprocess.call(cmd, shell=True) finally: @@ -89,7 +89,7 @@ finally: if ret != 0: print >>sys.stderr, """ Oops, the frontend tests failed. Tips for debugging: - * Check the frontend test server logs at zerver/tests/frontend/server.log + * Check the frontend test server logs at frontend_tests/server.log * Check the screenshots of failed tests at /tmp/casper-failure*.png * Try remote debugging the test web browser as described in docs/testing.rst """ diff --git a/zerver/tests/frontend/tests/00-login.js b/frontend_tests/tests/00-login.js similarity index 100% rename from zerver/tests/frontend/tests/00-login.js rename to frontend_tests/tests/00-login.js diff --git a/zerver/tests/frontend/tests/01-site.js b/frontend_tests/tests/01-site.js similarity index 100% rename from zerver/tests/frontend/tests/01-site.js rename to frontend_tests/tests/01-site.js diff --git a/zerver/tests/frontend/tests/02-narrow.js b/frontend_tests/tests/02-narrow.js similarity index 100% rename from zerver/tests/frontend/tests/02-narrow.js rename to frontend_tests/tests/02-narrow.js diff --git a/zerver/tests/frontend/tests/03-compose.js b/frontend_tests/tests/03-compose.js similarity index 100% rename from zerver/tests/frontend/tests/03-compose.js rename to frontend_tests/tests/03-compose.js diff --git a/zerver/tests/frontend/tests/04-subscriptions.js b/frontend_tests/tests/04-subscriptions.js similarity index 100% rename from zerver/tests/frontend/tests/04-subscriptions.js rename to frontend_tests/tests/04-subscriptions.js diff --git a/zerver/tests/frontend/tests/05-settings.js b/frontend_tests/tests/05-settings.js similarity index 100% rename from zerver/tests/frontend/tests/05-settings.js rename to frontend_tests/tests/05-settings.js diff --git a/zerver/tests/frontend/tests/07-stars.js b/frontend_tests/tests/07-stars.js similarity index 100% rename from zerver/tests/frontend/tests/07-stars.js rename to frontend_tests/tests/07-stars.js diff --git a/zerver/tests/frontend/tests/09-edit.js b/frontend_tests/tests/09-edit.js similarity index 100% rename from zerver/tests/frontend/tests/09-edit.js rename to frontend_tests/tests/09-edit.js diff --git a/zerver/tests/frontend/tests/10-navigation.js b/frontend_tests/tests/10-navigation.js similarity index 100% rename from zerver/tests/frontend/tests/10-navigation.js rename to frontend_tests/tests/10-navigation.js diff --git a/tools/generate-test-credentials b/tools/generate-test-credentials index 2ac1c1f614..60741cf464 100755 --- a/tools/generate-test-credentials +++ b/tools/generate-test-credentials @@ -5,7 +5,7 @@ cd "$(dirname "$0")"/.. email=iago@zulip.com password=$(python manage.py print_initial_password "$email" | fgrep "$email" | awk '{ print $2 }') -cat > zerver/tests/frontend/test_credentials.js < frontend_tests/test_credentials.js <