[Pkg-mozext-commits] [requestpolicy] 38/80: [refact][mozmill] `addonsManager.setCategoryById`

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 8924ee307fd847e6960544fb318659436d7aa179
Author: Martin Kimmerle <dev at 256k.de>
Date:   Fri Jun 5 15:54:24 2015 +0200

    [refact][mozmill] `addonsManager.setCategoryById`
    
    use `addonsManager.setCategoryById()`,
    remove unnecessary `AMHelper.setCategory()`
---
 .../restartlessness/lib/addon-manager-utils.js              |  7 -------
 tests/mozmill/highLevelTests/restartlessness/manifest.ini   | 13 +++++++++++++
 .../highLevelTests/restartlessness/testDisableExtension.js  |  4 +---
 .../highLevelTests/restartlessness/testEnableExtension.js   |  2 +-
 .../highLevelTests/restartlessness/testInstallExtension.js  |  2 +-
 .../restartlessness/testUninstallExtension.js               |  6 +++---
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/mozmill/highLevelTests/restartlessness/lib/addon-manager-utils.js b/tests/mozmill/highLevelTests/restartlessness/lib/addon-manager-utils.js
index 1113451..353df29 100644
--- a/tests/mozmill/highLevelTests/restartlessness/lib/addon-manager-utils.js
+++ b/tests/mozmill/highLevelTests/restartlessness/lib/addon-manager-utils.js
@@ -132,13 +132,6 @@ AMHelper.prototype.getAddon = function() {
   return addonList.length === 0 ? null : addonList[0];
 }
 
-AMHelper.prototype.setCategory = function(id) {
-  var self = this;
-  self.addonsManager.setCategory({
-    category: self.addonsManager.getCategoryById({id: id})
-  });
-}
-
 AMHelper.prototype.getSetupTabIndex = function() {
   var self = this;
   return self.findTabIndex(function(tab) {
diff --git a/tests/mozmill/highLevelTests/restartlessness/manifest.ini b/tests/mozmill/highLevelTests/restartlessness/manifest.ini
new file mode 100644
index 0000000..3cf332d
--- /dev/null
+++ b/tests/mozmill/highLevelTests/restartlessness/manifest.ini
@@ -0,0 +1,13 @@
+; This manifest file is used only directly, by calling `mozmill` with
+; the `-m` CLI option.
+; Example command:
+;     make unit-testing-xpi dev-helper-xpi ; \
+;     mozmill -a dist/rpcontinued-unit-testing.xpi -a dist/rpc-dev-helper.xpi \
+;       -b .mozilla/software/firefox/release/firefox \
+;       -m .mozilla/mozmill-tests/firefox/tests/addons/requestpolicy at requestpolicy.com/highLevelTests/restartlessness/manifest.ini
+
+[testDisableExtension.js]
+[testEnableExtension.js]
+[testUpgradeExtension.js]
+[testUninstallExtension.js]
+[testInstallExtension.js]
diff --git a/tests/mozmill/highLevelTests/restartlessness/testDisableExtension.js b/tests/mozmill/highLevelTests/restartlessness/testDisableExtension.js
index 1dbace3..6c91139 100644
--- a/tests/mozmill/highLevelTests/restartlessness/testDisableExtension.js
+++ b/tests/mozmill/highLevelTests/restartlessness/testDisableExtension.js
@@ -36,14 +36,12 @@ function teardownModule(aModule) {
 
 function testDisableExtension() {
   amHelper.openOnlyAddonManager();
-  amHelper.setCategory("extension");
+  addonsManager.setCategoryById({id: "extension"});
 
   var addon = amHelper.getAddon();
   assert.ok(addonsManager.isAddonEnabled({addon: addon}),
             "The addon is enabled");
 
-  //controller.sleep(3600000);
-
   // Disable the addon
   addonsManager.disableAddon({addon: addon});
 
diff --git a/tests/mozmill/highLevelTests/restartlessness/testEnableExtension.js b/tests/mozmill/highLevelTests/restartlessness/testEnableExtension.js
index e6fb330..d08a40f 100644
--- a/tests/mozmill/highLevelTests/restartlessness/testEnableExtension.js
+++ b/tests/mozmill/highLevelTests/restartlessness/testEnableExtension.js
@@ -36,7 +36,7 @@ function teardownModule(aModule) {
 
 function testEnableExtension() {
   amHelper.openOnlyAddonManager();
-  amHelper.setCategory("extension");
+  addonsManager.setCategoryById({id: "extension"});
 
   var addon = amHelper.getAddon();
 
diff --git a/tests/mozmill/highLevelTests/restartlessness/testInstallExtension.js b/tests/mozmill/highLevelTests/restartlessness/testInstallExtension.js
index 847e6de..cfa2506 100644
--- a/tests/mozmill/highLevelTests/restartlessness/testInstallExtension.js
+++ b/tests/mozmill/highLevelTests/restartlessness/testInstallExtension.js
@@ -55,7 +55,7 @@ function testInstallExtension() {
   }, "The setup tab has been opened.");
 
   amHelper.openOnlyAddonManager();
-  amHelper.setCategory("extension");
+  addonsManager.setCategoryById({id: "extension"});
 
   var addon = amHelper.getAddon();
   assert.ok(addonsManager.isAddonEnabled({addon: addon}),
diff --git a/tests/mozmill/highLevelTests/restartlessness/testUninstallExtension.js b/tests/mozmill/highLevelTests/restartlessness/testUninstallExtension.js
index 91158ec..0a6587c 100644
--- a/tests/mozmill/highLevelTests/restartlessness/testUninstallExtension.js
+++ b/tests/mozmill/highLevelTests/restartlessness/testUninstallExtension.js
@@ -36,7 +36,7 @@ function teardownModule(aModule) {
 
 function testUninstallExtension() {
   amHelper.openOnlyAddonManager();
-  amHelper.setCategory("extension");
+  addonsManager.setCategoryById({id: "extension"});
 
   var addon = amHelper.getAddon();
   assert.notEqual(addon, null,
@@ -47,8 +47,8 @@ function testUninstallExtension() {
 
   // Switch categories to dispose of the undo link,
   // i.e. switch to 'Appearance' and back to 'Extensions'.
-  amHelper.setCategory("theme");
-  amHelper.setCategory("extension");
+  addonsManager.setCategoryById({id: "theme"});
+  addonsManager.setCategoryById({id: "extension"});
 
   assert.equal(amHelper.getAddon(), null,
                "Extension '" + rpConst.ADDON_ID + "' has been uninstalled");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git