diff --git a/resources/static/test/cases/common/js/browser-support.js b/resources/static/test/cases/common/js/browser-support.js index 53c55c97151c4c4100c1953816e659e62fadefca..184d75eb483a7b160dd98e1aee43883afedd67b8 100644 --- a/resources/static/test/cases/common/js/browser-support.js +++ b/resources/static/test/cases/common/js/browser-support.js @@ -11,7 +11,7 @@ stubWindow, stubNavigator; - module("shared/browser-support", { + module("common/js/browser-support", { setup: function() { // Hard coded goodness for testing purposes stubNavigator = { diff --git a/resources/static/test/cases/common/js/class.js b/resources/static/test/cases/common/js/class.js index 1180ae6ca049e2530d9bb875ef969c9ccd87ebce..0ab9972eb3c1b29527a43fa9325378a52a2c1c93 100644 --- a/resources/static/test/cases/common/js/class.js +++ b/resources/static/test/cases/common/js/class.js @@ -6,7 +6,7 @@ (function() { "use strict"; - module("shared/class", { + module("common/js/class", { }); test("create a class with no superclass", function() { diff --git a/resources/static/test/cases/common/js/command.js b/resources/static/test/cases/common/js/command.js index ebe06d3ca909a3a8002fa9646677e019c319d2a8..5acf091f5b6f1898588724f14a30dc45d350cc1e 100644 --- a/resources/static/test/cases/common/js/command.js +++ b/resources/static/test/cases/common/js/command.js @@ -10,7 +10,7 @@ testHelpers = bid.TestHelpers, Command = bid.Command; - module("shared/command", { + module("common/js/command", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/common/js/enable_cookies_url.js b/resources/static/test/cases/common/js/enable_cookies_url.js index d6256521dfd87becded3fd77eb49c1e98221a7ad..62a36a4acdf2a73c3373fc9c0d207b50e456cd2c 100644 --- a/resources/static/test/cases/common/js/enable_cookies_url.js +++ b/resources/static/test/cases/common/js/enable_cookies_url.js @@ -9,7 +9,7 @@ var bid = BrowserID, testHelpers = bid.TestHelpers; - module("/shared/enable_cookies_url", { + module("/common/js/enable_cookies_url", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/common/js/helpers.js b/resources/static/test/cases/common/js/helpers.js index 3f12e46148f4124fe985d6ebe7737bfcdc1a490d..47583db4bdbaf92e699426084c16d923bdcbf5d4 100644 --- a/resources/static/test/cases/common/js/helpers.js +++ b/resources/static/test/cases/common/js/helpers.js @@ -10,7 +10,7 @@ helpers = bid.Helpers, testHelpers = bid.TestHelpers; - module("shared/helpers", { + module("common/js/helpers", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/signin", {}); diff --git a/resources/static/test/cases/common/js/history.js b/resources/static/test/cases/common/js/history.js index 394ccc23acbfe7b527435cc262e791070c8cecbe..20fe663007745c6716a645a117c7b606fd2abd3b 100644 --- a/resources/static/test/cases/common/js/history.js +++ b/resources/static/test/cases/common/js/history.js @@ -12,7 +12,7 @@ History = bid.History, history; - module("shared/history", { + module("common/js/history", { setup: function() { testHelpers.setup(); history = History.create(); diff --git a/resources/static/test/cases/common/js/models/interaction_data.js b/resources/static/test/cases/common/js/models/interaction_data.js index b09f8a2ad008612109786aaa3aafb76cfe8fed63..9e095b4860af36b4613aa9571cf0faf01bffde6c 100644 --- a/resources/static/test/cases/common/js/models/interaction_data.js +++ b/resources/static/test/cases/common/js/models/interaction_data.js @@ -11,7 +11,7 @@ testObjectValuesEqual = testHelpers.testObjectValuesEqual, xhr = bid.Mocks.xhr; - module("shared/models/interaction_data", { + module("common/js/models/interaction_data", { setup: function() { testHelpers.setup(); localStorage.removeItem("interaction_data"); diff --git a/resources/static/test/cases/common/js/modules/cookie_check.js b/resources/static/test/cases/common/js/modules/cookie_check.js index 593f8a72b41c96f0adef1419d267387cfeeaebb2..ed5637b9b18f00c83caf42c04cd67987b789844f 100644 --- a/resources/static/test/cases/common/js/modules/cookie_check.js +++ b/resources/static/test/cases/common/js/modules/cookie_check.js @@ -16,7 +16,7 @@ controller.start(config); } - module("shared/modules/cookie_check", { + module("common/js/modules/cookie_check", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/common/js/modules/page_module.js b/resources/static/test/cases/common/js/modules/page_module.js index da03cc638b5142d7ef25d6bec2b95f9e4866b5b4..37f5f8bbc3b301ac3a6781e8e74f3b7189f79604 100644 --- a/resources/static/test/cases/common/js/modules/page_module.js +++ b/resources/static/test/cases/common/js/modules/page_module.js @@ -17,7 +17,7 @@ controller.start(); } - module("shared/modules/page_module", { + module("common/js/modules/page_module", { setup: function() { el = $("#controller_head"); bid.TestHelpers.setup(); diff --git a/resources/static/test/cases/common/js/modules/xhr_delay.js b/resources/static/test/cases/common/js/modules/xhr_delay.js index 81e7c06d7b6ad3412c489a14f8b00cd88266248a..bf45dce5d9d1f3096fed55da877b2bf007826f7a 100644 --- a/resources/static/test/cases/common/js/modules/xhr_delay.js +++ b/resources/static/test/cases/common/js/modules/xhr_delay.js @@ -19,7 +19,7 @@ return mod; } - module("shared/modules/xhr_delay", { + module("common/js/modules/xhr_delay", { setup: function() { testHelpers.setup(); createModule(); diff --git a/resources/static/test/cases/common/js/renderer.js b/resources/static/test/cases/common/js/renderer.js index f3895f8665466b124c85ccc0680c2abd6d49c3d5..2c3b8f116e19dfcd174b7a7d4e88bcf89dbac0bb 100644 --- a/resources/static/test/cases/common/js/renderer.js +++ b/resources/static/test/cases/common/js/renderer.js @@ -10,7 +10,7 @@ renderer = bid.Renderer, testHelpers = bid.TestHelpers; - module("shared/renderer", { + module("common/js/renderer", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/common/js/screens.js b/resources/static/test/cases/common/js/screens.js index c989d5cfb43c6df7f1220f74f2e6962eac618f46..036ba3f3f66862ff3ef942ac80fb3f634880419a 100644 --- a/resources/static/test/cases/common/js/screens.js +++ b/resources/static/test/cases/common/js/screens.js @@ -11,7 +11,7 @@ testHelpers = bid.TestHelpers, el; - module("shared/screens", { + module("common/js/screens", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/common/js/state_machine.js b/resources/static/test/cases/common/js/state_machine.js index 60b5982ccb4e8f76f363914e25c18400b9747d0c..258378c6d79d7cc7f16cbaa10c7c3511f5dd932c 100644 --- a/resources/static/test/cases/common/js/state_machine.js +++ b/resources/static/test/cases/common/js/state_machine.js @@ -12,7 +12,7 @@ stateMachine, mediator = bid.Mediator; - module("shared/state_machine", { + module("common/js/state_machine", { setup: function() { testHelpers.setup(); diff --git a/resources/static/test/cases/common/js/storage.js b/resources/static/test/cases/common/js/storage.js index a347507f8e6bc74677a978db6af86c2c878fbace..cf1cff15893f4af7c5bb4a63ada6c1b3348f53e6 100644 --- a/resources/static/test/cases/common/js/storage.js +++ b/resources/static/test/cases/common/js/storage.js @@ -7,7 +7,7 @@ var storage = BrowserID.Storage, TEST_ORIGIN = "http://test.domain"; - module("shared/storage", { + module("common/js/storage", { setup: function() { storage.clear(); }, diff --git a/resources/static/test/cases/common/js/tooltip.js b/resources/static/test/cases/common/js/tooltip.js index b078911203a99b71d29d57439647c2c9ff8fb2ab..e084eb51103d61113526fcb832498f406bca5e2c 100644 --- a/resources/static/test/cases/common/js/tooltip.js +++ b/resources/static/test/cases/common/js/tooltip.js @@ -9,7 +9,7 @@ var bid = BrowserID, tooltip = bid.Tooltip - module("shared/tooltip", { + module("common/js/tooltip", { setup: function() { }, teardown: function() { diff --git a/resources/static/test/cases/common/js/validation.js b/resources/static/test/cases/common/js/validation.js index 2ca280e8df228b9dec34dd96c91fdc40de5bf3e9..228c61fc38d7cb7c61b18f4787d4bdddb7ac57d3 100644 --- a/resources/static/test/cases/common/js/validation.js +++ b/resources/static/test/cases/common/js/validation.js @@ -15,7 +15,7 @@ tooltipShown = true; } - module("shared/validation", { + module("common/js/validation", { setup: function() { origShowTooltip = bid.Tooltip.showTooltip; bid.Tooltip.showTooltip = showTooltip; diff --git a/resources/static/test/cases/common/js/xhr.js b/resources/static/test/cases/common/js/xhr.js index b1a06464dfd01bf1ada65238323e5407f9153a92..90aad33a2d2b0c29e5dd16f49f805bcc056bbbb6 100644 --- a/resources/static/test/cases/common/js/xhr.js +++ b/resources/static/test/cases/common/js/xhr.js @@ -14,7 +14,7 @@ mediator = bid.Mediator, testHelpers = bid.TestHelpers; - module("shared/xhr", { + module("common/js/xhr", { setup: function() { testHelpers.setup(); transport.setDelay(0); diff --git a/resources/static/test/cases/dialog/js/misc/internal_api.js b/resources/static/test/cases/dialog/js/misc/internal_api.js index f8a1de54a084e0879acca63400417ab5196a2c95..e266f7ded37a1f0056a3a3ddcaea8ea26717cb1f 100644 --- a/resources/static/test/cases/dialog/js/misc/internal_api.js +++ b/resources/static/test/cases/dialog/js/misc/internal_api.js @@ -23,7 +23,7 @@ start: function() {} }; - module("resources/internal_api", { + module("dialog/js/misc/internal_api", { setup: function() { testHelpers.setup(); moduleManager.reset(); diff --git a/resources/static/test/cases/dialog/js/modules/add_email.js b/resources/static/test/cases/dialog/js/modules/add_email.js index 7e7000ca556cc3953ef6ec898a7c96a37c2dc8df..2194edac3877e8618378f4c276a9b0d32a8bc367 100644 --- a/resources/static/test/cases/dialog/js/modules/add_email.js +++ b/resources/static/test/cases/dialog/js/modules/add_email.js @@ -17,7 +17,7 @@ register = testHelpers.register; - module("controllers/add_email", { + module("dialog/js/modules/add_email", { setup: function() { $("#newEmail").val(""); testHelpers.setup(); diff --git a/resources/static/test/cases/dialog/js/modules/authenticate.js b/resources/static/test/cases/dialog/js/modules/authenticate.js index 7952811e9e066da8631b160d9780d0b68453f112..981bd708f5b5a06e065269325e28b741f2078734 100644 --- a/resources/static/test/cases/dialog/js/modules/authenticate.js +++ b/resources/static/test/cases/dialog/js/modules/authenticate.js @@ -31,7 +31,7 @@ controller.start(options); } - module("controllers/authenticate", { + module("dialog/js/modules/authenticate", { setup: function() { reset(); $("input[type=password]").hide(); diff --git a/resources/static/test/cases/dialog/js/modules/check_registration.js b/resources/static/test/cases/dialog/js/modules/check_registration.js index 82da23a350875070a5a3b925341c19fa0d5e3f29..29c84236e7e2f0c9cf52801cfd678c04882145dc 100644 --- a/resources/static/test/cases/dialog/js/modules/check_registration.js +++ b/resources/static/test/cases/dialog/js/modules/check_registration.js @@ -24,7 +24,7 @@ }); } - module("controllers/check_registration", { + module("dialog/js/modules/check_registration", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/dialog.js b/resources/static/test/cases/dialog/js/modules/dialog.js index 87ea235e58aaf7a7b8738569c5bcefd3f477dd09..8857ee8ff414da78f10965ed5deb0debc6a3df2b 100644 --- a/resources/static/test/cases/dialog/js/modules/dialog.js +++ b/resources/static/test/cases/dialog/js/modules/dialog.js @@ -68,7 +68,7 @@ controller.start(options); } - module("controllers/dialog", { + module("dialog/js/modules/dialog", { setup: function() { winMock = new WinMock(); testHelpers.setup(); diff --git a/resources/static/test/cases/dialog/js/modules/forgot_password.js b/resources/static/test/cases/dialog/js/modules/forgot_password.js index 4d782af44d9c8f7d004bc09fdfe2a487301455b2..46a2bf81583182a07f65e2edb56ad9d3b58247b4 100644 --- a/resources/static/test/cases/dialog/js/modules/forgot_password.js +++ b/resources/static/test/cases/dialog/js/modules/forgot_password.js @@ -16,7 +16,7 @@ controller.start(options); } - module("controllers/forgotpassword_controller", { + module("dialog/js/modules/forgotpassword_controller", { setup: function() { $("#email").val(""); bid.TestHelpers.setup(); diff --git a/resources/static/test/cases/dialog/js/modules/generate_assertion.js b/resources/static/test/cases/dialog/js/modules/generate_assertion.js index 04201f05e33a12103334a3275476e3c45f5329c0..a619e1717696fec4643f1ce3edff20ba9e5da6b7 100644 --- a/resources/static/test/cases/dialog/js/modules/generate_assertion.js +++ b/resources/static/test/cases/dialog/js/modules/generate_assertion.js @@ -21,7 +21,7 @@ controller.start(config); } - module("controllers/email_chosen", { + module("dialog/js/modules/email_chosen", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/is_this_your_computer.js b/resources/static/test/cases/dialog/js/modules/is_this_your_computer.js index cc31ae506656633f24b9b961339642b5c7862cb0..a19c3ebf734927752a2f39943055da89256b345c 100644 --- a/resources/static/test/cases/dialog/js/modules/is_this_your_computer.js +++ b/resources/static/test/cases/dialog/js/modules/is_this_your_computer.js @@ -17,7 +17,7 @@ register = testHelpers.register; - module("controllers/is_this_your_computer", { + module("dialog/js/modules/is_this_your_computer", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/pick_email.js b/resources/static/test/cases/dialog/js/modules/pick_email.js index ff7b28eb56aaf4720d933daecc8a868563313476..d422732cd0d741b9f3c2da158c3c41cbabea11db 100644 --- a/resources/static/test/cases/dialog/js/modules/pick_email.js +++ b/resources/static/test/cases/dialog/js/modules/pick_email.js @@ -13,7 +13,7 @@ testOrigin = testHelpers.testOrigin, register = bid.TestHelpers.register; - module("controllers/pick_email", { + module("dialog/js/modules/pick_email", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/primary_user_provisioned.js b/resources/static/test/cases/dialog/js/modules/primary_user_provisioned.js index e17d3e4c5a0791b57677c963f924a42b88cf4b3f..02d3a01699629049eb41b89cb15566f48052846b 100644 --- a/resources/static/test/cases/dialog/js/modules/primary_user_provisioned.js +++ b/resources/static/test/cases/dialog/js/modules/primary_user_provisioned.js @@ -16,7 +16,7 @@ xhr = bid.Mocks.xhr, mediator = bid.Mediator; - module("controllers/primary_user_provisioned", { + module("dialog/js/modules/primary_user_provisioned", { setup: function() { testHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/provision_primary_user.js b/resources/static/test/cases/dialog/js/modules/provision_primary_user.js index d5c540849802c80b10796e8efd7677491cb51645..4a607affab5b9ccd0bfc8e528b2b81b206c63008 100644 --- a/resources/static/test/cases/dialog/js/modules/provision_primary_user.js +++ b/resources/static/test/cases/dialog/js/modules/provision_primary_user.js @@ -16,7 +16,7 @@ mediator = bid.Mediator, provisioning = bid.Mocks.Provisioning; - module("controllers/provision_primary_user", { + module("dialog/js/modules/provision_primary_user", { setup: function() { bid.TestHelpers.setup(); }, diff --git a/resources/static/test/cases/dialog/js/modules/required_email.js b/resources/static/test/cases/dialog/js/modules/required_email.js index 2c42d0c1ed1df24e263d1d68c32d93f0a0bc7384..7bb7d5c4aa6bd7db6c03980619fbe4fc1d8efe38 100644 --- a/resources/static/test/cases/dialog/js/modules/required_email.js +++ b/resources/static/test/cases/dialog/js/modules/required_email.js @@ -17,7 +17,7 @@ origStart; - module("controllers/required_email", { + module("dialog/js/modules/required_email", { setup: function() { origStart = start; var count = 0; diff --git a/resources/static/test/cases/dialog/js/modules/rp_info.js b/resources/static/test/cases/dialog/js/modules/rp_info.js index a16bb67ff5108a54554bf243c1a9a6bb95e778da..24d3d4a24cf10e21fdee7f5ca10f4135c5b1fe8c 100644 --- a/resources/static/test/cases/dialog/js/modules/rp_info.js +++ b/resources/static/test/cases/dialog/js/modules/rp_info.js @@ -19,7 +19,7 @@ RP_HTTPS_LOGO = "https://en.gravatar.com/userimage/6966791/c4feac761b8544cce13e0406f36230aa.jpg", mediator = bid.Mediator; - module("controllers/rp_info", { + module("dialog/js/modules/rp_info", { setup: testHelpers.setup, teardown: function() { diff --git a/resources/static/test/cases/dialog/js/modules/set_password.js b/resources/static/test/cases/dialog/js/modules/set_password.js index 529ef0d1c18aa7b3c44e7d60c91cd1fe18460396..15601f75aa154317abd680c18cc42b240091dd79 100644 --- a/resources/static/test/cases/dialog/js/modules/set_password.js +++ b/resources/static/test/cases/dialog/js/modules/set_password.js @@ -20,7 +20,7 @@ controller.start(options); } - module("controllers/set_password", { + module("dialog/js/modules/set_password", { setup: function() { testHelpers.setup(); createController(); diff --git a/resources/static/test/cases/pages/js/about.js b/resources/static/test/cases/pages/js/about.js index e00fbf5674a9dd6efc337b1005649df49891ebcd..7edc75903ec7aff17d198c3859982420babae833 100644 --- a/resources/static/test/cases/pages/js/about.js +++ b/resources/static/test/cases/pages/js/about.js @@ -10,7 +10,7 @@ testHelpers = bid.TestHelpers, controller; - module("pages/about", { + module("pages/js/about", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/about", {}); diff --git a/resources/static/test/cases/pages/js/forgot.js b/resources/static/test/cases/pages/js/forgot.js index 120026480de3836ae0791345d500eda702970d84..67746a327b96ea7296f790c9af9c4ff0ed51e8b3 100644 --- a/resources/static/test/cases/pages/js/forgot.js +++ b/resources/static/test/cases/pages/js/forgot.js @@ -12,7 +12,7 @@ testHelpers = bid.TestHelpers, xhr = bid.Mocks.xhr; - module("pages/forgot", { + module("pages/js/forgot", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/forgot", {}); diff --git a/resources/static/test/cases/pages/js/manage_account.js b/resources/static/test/cases/pages/js/manage_account.js index d4fc4b1f8412f55b978e458133608e92389f24f8..a7c5518668640fcadd735a2b3d204e258bbfd654 100644 --- a/resources/static/test/cases/pages/js/manage_account.js +++ b/resources/static/test/cases/pages/js/manage_account.js @@ -17,7 +17,7 @@ document: { location: "" } }; - module("pages/manage_account", { + module("pages/js/manage_account", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/index", {}); diff --git a/resources/static/test/cases/pages/js/signin.js b/resources/static/test/cases/pages/js/signin.js index 4927cb5e602a668eeb4ba1b524a12a280e511928..9e07840d19773eae0b45a1f60d9000badb9b43a6 100644 --- a/resources/static/test/cases/pages/js/signin.js +++ b/resources/static/test/cases/pages/js/signin.js @@ -19,7 +19,7 @@ controller, winchan; - module("pages/signin", { + module("pages/js/signin", { setup: function() { testHelpers.setup(); docMock.location = "signin"; diff --git a/resources/static/test/cases/pages/js/signup.js b/resources/static/test/cases/pages/js/signup.js index 7db9cae261cf2840ab49f59b2d1e31eeadf896c4..736e1a3b636b7166812c39f8af524fe3f3164b44 100644 --- a/resources/static/test/cases/pages/js/signup.js +++ b/resources/static/test/cases/pages/js/signup.js @@ -16,7 +16,7 @@ winchan, controller; - module("pages/signup", { + module("pages/js/signup", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/signup", {}); diff --git a/resources/static/test/cases/pages/js/verify_secondary_address.js b/resources/static/test/cases/pages/js/verify_secondary_address.js index 8afe1e7f1030a16f0a3db3e181b2e3713e32038e..38c7fe4a8d12c97fe6463886780c822f6ca28248 100644 --- a/resources/static/test/cases/pages/js/verify_secondary_address.js +++ b/resources/static/test/cases/pages/js/verify_secondary_address.js @@ -23,7 +23,7 @@ }, doc; - module("pages/verify_secondary_address", { + module("pages/js/verify_secondary_address", { setup: function() { testHelpers.setup(); bid.Renderer.render("#page_head", "site/confirm", {});