Issue 101 - Fix icon tests

chrome/content/tests/ui/icon_position.js

 (function()
 {
   let {application} = require("info");
   if (application != "firefox")
     return;
 
   let CustomizableUI =  null;
   let usingShim = false;
   try
   {
     ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
   }
   catch (e)
   {
     usingShim = true;
     // No built-in CustomizableUI API, use our own implementation.
     ({CustomizableUI}) = require("customizableUI");
   }
 
   let wnd = Utils.getChromeWindow(window);
-  let toolbox = wnd.document.getElementById("navigator-toolbox");
-  if (!toolbox)
-    return;

[Wladimir Palant, 2014/07/31 11:36:15]

This is only relevant when we are using the shim - otherwise we don't care
whether we can find the toolbox.

While at it, we probably want to do this without any hardcoding as well:

  let defaultParent = require("appSupport").defaultToolbarPosition.parent;
  if (!defaultParent)
    ...
  let toolbar = wnd.document.getElementById(defaultParent);
  if (!toolbar)
    ...
  let toolbox = toolbar.toolbox;

+  let defaultParent = require("appSupport").defaultToolbarPosition.parent;
+
+  let toolbox;
+  if (usingShim)
+  {
+    let toolbar = wnd.document.getElementById(defaultParent);
+    if (!toolbar)
+      return;
+    toolbox = toolbar.toolbox;
+  }
 
   module("Icon position", {
     setup: function()
     {
       // Force default position
       if (usingShim)
         toolbox.removeAttribute("abp-iconposition");
 
       if (UI.isToolbarIconVisible(wnd))
         UI.toggleToolbarIcon();
     },
     teardown: function()
     {
       UI.toggleToolbarIcon();
       UI.toggleToolbarIcon();
     }
   });
 
   test("Put icon at default position", function()
   {
-    const DEFUALT = require("appSupport").defaultToolbarPosition.parent;

[Wladimir Palant, 2014/07/31 11:36:15]

This is misspelled. Still, I would prefer a proper variable name, e.g.
defaultParent.

-
     UI.toggleToolbarIcon();
     let placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
     ok(placement, "Button is visible");
     if (placement)
-      equal(placement.area, DEFUALT, "Button is at the right position");
+      equal(placement.area, defaultParent, "Button is at the right position");
 
     UI.toggleToolbarIcon();
     placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
     ok(!placement, "Button is invisible");
 
     UI.toggleToolbarIcon();
     placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
     ok(placement, "Button is visible");
     if (placement)
-      equal(placement.area, DEFUALT, "Button is at the right position again");
+      equal(placement.area, defaultParent, "Button is at the right position again");
   });
 
   test("Move icon into tabs bar and restore", function()
   {
     // The shim doesn't have proper support for addToWidgetArea
     if (usingShim) {
       ok(true, "Can't test");
       return;
     }
 
@@ skipping 10 matching lines @@
     ok(!placement, "Button is invisible");
 
     UI.toggleToolbarIcon();
     placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
     ok(placement, "Button is visible");
     if (placement)
       equal(placement.area, CustomizableUI.AREA_NAVBAR, "Button is at default position");
   });
 
 })();