From 83652219cc30270127e89042a63ad8773b49237e Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Mon, 16 Jul 2012 11:52:25 +0100
Subject: [PATCH] Update unit test module names to match directory structure.
---
resources/static/test/cases/common/js/browser-support.js | 2 +-
resources/static/test/cases/common/js/class.js | 2 +-
resources/static/test/cases/common/js/command.js | 2 +-
resources/static/test/cases/common/js/enable_cookies_url.js | 2 +-
resources/static/test/cases/common/js/helpers.js | 2 +-
resources/static/test/cases/common/js/history.js | 2 +-
.../static/test/cases/common/js/models/interaction_data.js | 2 +-
resources/static/test/cases/common/js/modules/cookie_check.js | 2 +-
resources/static/test/cases/common/js/modules/page_module.js | 2 +-
resources/static/test/cases/common/js/modules/xhr_delay.js | 2 +-
resources/static/test/cases/common/js/renderer.js | 2 +-
resources/static/test/cases/common/js/screens.js | 2 +-
resources/static/test/cases/common/js/state_machine.js | 2 +-
resources/static/test/cases/common/js/storage.js | 2 +-
resources/static/test/cases/common/js/tooltip.js | 2 +-
resources/static/test/cases/common/js/validation.js | 2 +-
resources/static/test/cases/common/js/xhr.js | 2 +-
resources/static/test/cases/dialog/js/misc/internal_api.js | 2 +-
resources/static/test/cases/dialog/js/modules/add_email.js | 2 +-
resources/static/test/cases/dialog/js/modules/authenticate.js | 2 +-
.../static/test/cases/dialog/js/modules/check_registration.js | 2 +-
resources/static/test/cases/dialog/js/modules/dialog.js | 2 +-
.../static/test/cases/dialog/js/modules/forgot_password.js | 2 +-
.../static/test/cases/dialog/js/modules/generate_assertion.js | 2 +-
.../test/cases/dialog/js/modules/is_this_your_computer.js | 2 +-
resources/static/test/cases/dialog/js/modules/pick_email.js | 2 +-
.../test/cases/dialog/js/modules/primary_user_provisioned.js | 2 +-
.../test/cases/dialog/js/modules/provision_primary_user.js | 2 +-
resources/static/test/cases/dialog/js/modules/required_email.js | 2 +-
resources/static/test/cases/dialog/js/modules/rp_info.js | 2 +-
resources/static/test/cases/dialog/js/modules/set_password.js | 2 +-
resources/static/test/cases/pages/js/about.js | 2 +-
resources/static/test/cases/pages/js/forgot.js | 2 +-
resources/static/test/cases/pages/js/manage_account.js | 2 +-
resources/static/test/cases/pages/js/signin.js | 2 +-
resources/static/test/cases/pages/js/signup.js | 2 +-
.../static/test/cases/pages/js/verify_secondary_address.js | 2 +-
37 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/resources/static/test/cases/common/js/browser-support.js b/resources/static/test/cases/common/js/browser-support.js
index 53c55c971..184d75eb4 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 1180ae6ca..0ab9972eb 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 ebe06d3ca..5acf091f5 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 d6256521d..62a36a4ac 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 3f12e4614..47583db4b 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 394ccc23a..20fe66300 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 b09f8a2ad..9e095b486 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 593f8a72b..ed5637b9b 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 da03cc638..37f5f8bbc 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 81e7c06d7..bf45dce5d 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 f3895f866..2c3b8f116 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 c989d5cfb..036ba3f3f 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 60b5982cc..258378c6d 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 a347507f8..cf1cff158 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 b07891120..e084eb511 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 2ca280e8d..228c61fc3 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 b1a06464d..90aad33a2 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 f8a1de54a..e266f7ded 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 7e7000ca5..2194edac3 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 7952811e9..981bd708f 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 82da23a35..29c84236e 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 87ea235e5..8857ee8ff 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 4d782af44..46a2bf815 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 04201f05e..a619e1717 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 cc31ae506..a19c3ebf7 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 ff7b28eb5..d422732cd 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 e17d3e4c5..02d3a0169 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 d5c540849..4a607affa 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 2c42d0c1e..7bb7d5c4a 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 a16bb67ff..24d3d4a24 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 529ef0d1c..15601f75a 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 e00fbf567..7edc75903 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 120026480..67746a327 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 d4fc4b1f8..a7c551866 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 4927cb5e6..9e07840d1 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 7db9cae26..736e1a3b6 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 8afe1e7f1..38c7fe4a8 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", {});
--
GitLab