[Pkg-mozext-commits] [compactheader] 427/441: Fix tests (name of other actions button) and default button settings

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit ea57a677dd6aecc85d0c295a4aaa960f28ef7ce1
Author: jmozmoz <Joachim.Herb at gmx.de>
Date:   Sun Dec 21 23:27:55 2014 +0100

    Fix tests (name of other actions button) and default button settings
---
 build.xml                                             |  2 +-
 chrome/CompactHeader/content/compactHeaderOverlay.xul |  2 +-
 chrome/CompactHeader/skin/mac/osdef.css               |  7 -------
 install.rdf                                           |  2 +-
 test/compactheader/test-compactheader-toolbar.js      | 19 -------------------
 test/compactheader/test-other-actions-button.js       | 12 ++++++------
 6 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/build.xml b/build.xml
index cb6b804..5fd5318 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 <project name="CompactHeader" default="dist">
   <property name="src.dir" value="." />
-	<property name="mozdev.dir" value="${src.dir}/../compactheader.mozdev.org"/>
+	<property name="mozdev.dir" value="${src.dir}/../../workspace/compactheader.mozdev.org"/>
   <property name="dist.dir" value="${mozdev.dir}/downloads/"/>
   <property name="AMOdist.dir" value="${src.dir}/AMO/"/>
   <property name="www.dir" value="${mozdev.dir}/www/"/>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 00740f3..5a3c1c3 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -107,7 +107,7 @@
           </toolbarpalette>
           <toolbar id="header-view-toolbar"
                    mode="icons" defaultmode="icons"
-                   defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
+                   defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,otherActionsButton">
           </toolbar>
         </toolbox>
       </html:div>
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index ab27f5e..ec47ac1 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -42,13 +42,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* All values copied from gnomestrip theme. Have to be checked */
-#CompactHeader_hdrOtherActionsButton {
-  list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
-}
-
-toolbar[iconsize="small"] #CompactHeader_hdrOtherActionsButton {
-  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-}
 
 #expandedButtonBox {
   margin: 0px;
diff --git a/install.rdf b/install.rdf
index a90008b..6290753 100644
--- a/install.rdf
+++ b/install.rdf
@@ -14,7 +14,7 @@
         <em:translator>Peter Klofutar</em:translator>
       </Description>
     </em:localized>
-		<em:version>2.1.0beta1</em:version>
+		<em:version>2.1.0beta2</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index e139f40..d9fb69c 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -212,25 +212,6 @@ function test_customize_header_toolbar_check_default()
 }
 
 /**
-*  Test that other action button has icon
-*/
-function test_other_actions_icon()
-{
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-
-  // Restore the default buttons to get defined starting conditions.
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-  restore_and_check_default_buttons(mc);
-
-  let otherActionIcon = mc.a('CompactHeader_hdrOtherActionsButton', {class: "toolbarbutton-icon"});
-
-  let imageSrc = 'url("chrome://compactheader-os/skin/other-action-small.png")';
-  assert_equals(mc.window.getComputedStyle(otherActionIcon).getPropertyValue("list-style-image"), imageSrc);
-
-}
-
-/**
  *  Test header pane toolbar customization: Reorder buttons
  */
 function test_customize_header_toolbar_reorder_buttons()
diff --git a/test/compactheader/test-other-actions-button.js b/test/compactheader/test-other-actions-button.js
index 493f01b..0a86dde 100644
--- a/test/compactheader/test-other-actions-button.js
+++ b/test/compactheader/test-other-actions-button.js
@@ -95,9 +95,9 @@ function test_other_actions_button() {
   set_and_assert_toolbox_position(mc, 'right');
 
   // It is necessary to press the Other Actions Button to get the popup menu populated
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
   mc.ewait("CompactHeader_hidecohePreferencesButton");
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
 
   let menuItems = {
     "otherActionsOpenConversation":      false, // always disabled, probably because messages are not indexed
@@ -120,9 +120,9 @@ function test_other_actions_button() {
   assert_nothing_selected();
 
   // It is necessary to press the Other Actions Button to get the popup menu populated
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
   mc.ewait("CompactHeader_hidecohePreferencesButton");
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
 
   for (let menu in menuItems) {
     let menuEl = mc.e(menu);
@@ -133,9 +133,9 @@ function test_other_actions_button() {
   select_control_click_row(0);
   assert_selected_and_displayed(0, 3);
 
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
   mc.ewait("CompactHeader_hidecohePreferencesButton");
-  mc.click(mc.eid("CompactHeader_hdrOtherActionsButton"));
+  mc.click(mc.eid("otherActionsButton"));
 
   for (let menu in menuItems) {
     let menuEl = mc.e(menu);

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