[Pkg-mozext-commits] [compactheader] 317/441: Version 2.0.0beta1: Make show/hide detail button a little bit bigger on all OS. Add mozmill tests for toolbar positioning.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository compactheader.
commit 40a0a62831846f83b271588d3c4a599149de6f85
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Tue Dec 13 00:20:47 2011 +0100
Version 2.0.0beta1: Make show/hide detail button a little bit bigger on all OS.
Add mozmill tests for toolbar positioning.
--HG--
branch : sidebars
---
chrome/CompactHeader/skin/global/CompactHeader.css | 8 ++
chrome/CompactHeader/skin/gnome/osdef.css | 13 ---
install.rdf | 2 +-
.../test-compactheader-preferences.js | 8 +-
test/compactheader/test-compactheader-toolbar.js | 113 +++++++++++++++++----
test/shared-modules/test-compactheader-helpers.js | 108 ++++++++++++++++++--
6 files changed, 205 insertions(+), 47 deletions(-)
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 7764935..694c3e7 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -351,3 +351,11 @@ toolbar[orient="vertical"] toolbarbutton hbox {
min-width: 20px;
min-height: 100px;
}
+
+#CompactHeader_hideDetailsButton:hover,
+#CompactHeader_hideDetailsButton,
+#CompactHeader_showDetailsButton:hover,
+#CompactHeader_showDetailsButton {
+ width: 13px;
+ height: 13px;
+}
diff --git a/chrome/CompactHeader/skin/gnome/osdef.css b/chrome/CompactHeader/skin/gnome/osdef.css
index acadbe9..1fe9093 100644
--- a/chrome/CompactHeader/skin/gnome/osdef.css
+++ b/chrome/CompactHeader/skin/gnome/osdef.css
@@ -157,16 +157,3 @@ toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
margin-left: 5px;
margin-right: 5px;
}
-
-#CompactHeader_hideDetailsButton:hover,
-#CompactHeader_hideDetailsButton {
- width: 13px;
- height: 9px;
-}
-
-#CompactHeader_showDetailsButton:hover,
-#CompactHeader_showDetailsButton {
- width: 13px;
- height: 9px;
-}
-
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index 5e4588c..b320358 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
<RDF:Description about="urn:mozilla:install-manifest">
<em:name>CompactHeader</em:name>
- <em:version>2.0.0alpha2</em:version>
+ <em:version>2.0.0beta1</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-preferences.js b/test/compactheader/test-compactheader-preferences.js
index be07e70..a8b0c40 100644
--- a/test/compactheader/test-compactheader-preferences.js
+++ b/test/compactheader/test-compactheader-preferences.js
@@ -65,6 +65,9 @@ var messageBodyISO8859_1 = "ae: " + String.fromCharCode(228) +
", UE: " + String.fromCharCode(220) +
", ss: " + String.fromCharCode(223) + "\n";
+//var messageBodyUTF8 = "ae: ä, oe: ö, ue: ü, " +
+// "AE: Ä, OE: Ö, UE: Ü, ss: ß";
+
//var messageBodyUTF8 = "ae: \uc3a4, oe: \uceb6, ue: \uc3bc, " +
// "AE: \uc384, OE: \uc396, UE: \uc39c, ss: \uce9f";
@@ -148,11 +151,6 @@ function test_single_preference_change_folder(){
select_message_in_folder(folder2, 0, mc);
}
-function subtest_change_twoline(aController) {
- aController.click(aController.eid("CompactHeader_checkboxCompactTwolineView"));
- close_preferences_dialog(aController);
-}
-
function addToFolder(aSubject, aBody, aFolder, aCharset) {
let msgId = Components.classes["@mozilla.org/uuid-generator;1"]
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index 778dd67..bbce053 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -93,7 +93,7 @@ function setupModule(module) {
function test_get_msg_button_customize_header_toolbar(){
select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// It is necessary to press the Get Message Button to get the popup menu populated
mc.click(mc.aid("button-getmsg", {class: "toolbarbutton-menubutton-dropmarker"}));
@@ -131,7 +131,7 @@ function test_customize_header_toolbar_check_default()
let hdrToolbar = mc.eid("header-view-toolbar").node;
let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
// In a fresh profile the currentset attribute does not
// exist, i.e. it returns empty. So check for both valid
@@ -173,7 +173,7 @@ function test_other_actions_icon()
// Restore the default buttons to get defined starting conditions.
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
restore_and_check_default_buttons(mc);
let otherActionIcon = mc.a('CompactHeader_hdrOtherActionsButton', {class: "toolbarbutton-icon"});
@@ -192,7 +192,7 @@ function test_customize_header_toolbar_reorder_buttons()
// Restore the default buttons to get defined starting conditions.
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
restore_and_check_default_buttons(mc);
// Save the currentSet of the toolbar before opening the
@@ -224,7 +224,7 @@ function test_customize_header_toolbar_reorder_buttons()
let msgc = open_selected_message_in_new_window();
assert_selected_and_displayed(msgc, curMessage);
expand_and_assert_header(msgc);
- set_and_assert_top_toolbox_position(msgc);
+ set_and_assert_toolbox_position(msgc, 'top');
let hdrToolbar = msgc.eid("header-view-toolbar").node;
let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
@@ -243,7 +243,7 @@ function test_customize_header_toolbar_separate_window()
{
let curMessage = select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
@@ -253,7 +253,7 @@ function test_customize_header_toolbar_separate_window()
let msgc = open_selected_message_in_new_window();
assert_selected_and_displayed(msgc, curMessage);
expand_and_assert_header(msgc);
- set_and_assert_top_toolbox_position(msgc);
+ set_and_assert_toolbox_position(msgc, 'top');
let hdrToolbar = msgc.eid("header-view-toolbar").node;
let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
@@ -322,7 +322,7 @@ function test_customize_header_toolbar_remove_buttons(){
select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
@@ -405,7 +405,7 @@ function test_customize_header_toolbar_add_all_buttons(){
select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
@@ -528,7 +528,7 @@ function test_customize_header_toolbar_add_all_buttons(){
function test_customize_header_toolbar_dialog_style(){
select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
@@ -567,7 +567,7 @@ function test_customize_header_toolbar_dialog_style(){
function test_customize_header_toolbar_change_button_style(){
select_message_in_folder(folder, 0, mc);
expand_and_assert_header(mc);
- set_and_assert_top_toolbox_position(mc);
+ set_and_assert_toolbox_position(mc, 'top');
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
@@ -607,14 +607,93 @@ function test_customize_header_toolbar_change_button_style(){
}
function test_set_toolbar_position() {
-}
-
-function test_toolbar_visibility() {
-
-}
+ select_message_in_folder(folder, 0, mc);
+ expand_and_assert_header(mc);
+ restore_and_check_default_buttons(mc);
-function test_sidebar_style() {
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+
+ collapse_and_assert_header(mc);
+ open_preferences_dialog(mc, subtest_change_twoline);
+
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+
+ collapse_and_assert_header(mc);
+ open_preferences_dialog(mc, subtest_change_oneline);
+
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'top');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'left');
+ set_and_assert_toolbox_position(mc, 'right');
+ set_and_assert_toolbox_position(mc, 'none');
+ set_and_assert_toolbox_position(mc, 'top');
+ expand_and_assert_header(mc);
+ restore_and_check_default_buttons(mc);
}
diff --git a/test/shared-modules/test-compactheader-helpers.js b/test/shared-modules/test-compactheader-helpers.js
index 71bc743..b35a467 100644
--- a/test/shared-modules/test-compactheader-helpers.js
+++ b/test/shared-modules/test-compactheader-helpers.js
@@ -80,7 +80,9 @@ function installInto(module) {
module.close_header_pane_toolbar_customization = close_header_pane_toolbar_customization;
module.filterInvisibleButtons = filterInvisibleButtons;
module.canMoveToolbox = canMoveToolbox;
- module.set_and_assert_top_toolbox_position = set_and_assert_top_toolbox_position;
+ module.set_and_assert_toolbox_position = set_and_assert_toolbox_position;
+ module.subtest_change_oneline = subtest_change_oneline;
+ module.subtest_change_twoline = subtest_change_twoline;
}
function reopen_3pane_window() {
@@ -283,17 +285,101 @@ function set_top_toobox_position(aController) {
close_preferences_dialog(aController);
}
-function set_and_assert_top_toolbox_position(aController) {
- open_preferences_dialog(aController, set_top_toobox_position);
- expand_and_assert_header(aController);
- aController.sleep(100);
- let e = aController.e("msgHeaderViewDeck").getElementsByAttribute("id", "header-view-toolbox");
- folderDisplayHelper.assert_equals(e.length, 1);
+function set_left_toobox_position(aController) {
+ if (canMoveToolbox()) {
+ aController.click(aController.eid("CompactHeader_hdrToolbox.pos.left"));
+ }
+ close_preferences_dialog(aController);
+}
+
+function set_right_toobox_position(aController) {
+ if (canMoveToolbox()) {
+ aController.click(aController.eid("CompactHeader_hdrToolbox.pos.right"));
+ }
+ close_preferences_dialog(aController);
+}
+
+function set_none_toobox_position(aController) {
+ if (canMoveToolbox()) {
+ aController.click(aController.eid("CompactHeader_hdrToolbox.pos.none"));
+ }
+ close_preferences_dialog(aController);
+}
+
+var setToolboxPositionPreferences = new Array();
+setToolboxPositionPreferences = {
+ 'top': {
+ setFunc: set_top_toobox_position,
+ pos: 'msgHeaderViewDeck',
+ collapsed: false,
+ other: ['CompactHeader_leftSidebar', 'CompactHeader_rightSidebar']
+ },
+ 'left': {
+ setFunc: set_left_toobox_position,
+ pos: 'CompactHeader_leftSidebar',
+ collapsed: false,
+ other: ['expandedHeadersBox', 'CompactHeader_rightSidebar']
+ },
+ 'right': {
+ setFunc: set_right_toobox_position,
+ pos: 'CompactHeader_rightSidebar',
+ collapsed: false,
+ other: ['CompactHeader_leftSidebar', 'expandedHeadersBox']
+ },
+ 'none': {
+ setFunc: set_none_toobox_position,
+ pos: 'messagepaneboxwrapper',
+ collapsed: true,
+ other: []
+ }
+};
+function set_and_assert_toolbox_position(aController, aPosition) {
+ open_preferences_dialog(aController, setToolboxPositionPreferences[aPosition].setFunc);
+// expand_and_assert_header(aController);
+ aController.sleep(300);
if (canMoveToolbox()) {
- e = aController.e("CompactHeader_leftSidebar").getElementsByAttribute("id", "header-view-toolbox");
- folderDisplayHelper.assert_equals(e.length, 0);
- e = aController.e("CompactHeader_rightSidebar").getElementsByAttribute("id", "header-view-toolbox");
- folderDisplayHelper.assert_equals(e.length, 0);
+ let pos = setToolboxPositionPreferences[aPosition].pos;
+ let e = aController.e(pos).getElementsByAttribute("id", "header-view-toolbox");
+ folderDisplayHelper.assert_equals(e.length, 1);
+ let c = setToolboxPositionPreferences[aPosition].collapsed;
+ if (c) {
+ folderDisplayHelper.assert_equals(e[0].getAttribute("collapsed"), "true");
+ }
+ else {
+ folderDisplayHelper.assert_equals(e[0].hasAttribute("collapsed"), false);
+ }
+
+ for (let i = 0; i < setToolboxPositionPreferences[aPosition].other.length; i++) {
+ let pos = setToolboxPositionPreferences[aPosition].other[i];
+ let e = aController.e(pos).getElementsByAttribute("id", "header-view-toolbox");
+ folderDisplayHelper.assert_equals(e.length, 0);
+ }
+ }
+ else {
+ let pos = "msgHeaderViewDeck";
+ let e = aController.e(pos).getElementsByAttribute("id", "header-view-toolbox");
+ folderDisplayHelper.assert_equals(e.length, 1);
}
}
+
+function subtest_change_oneline(aController) {
+ let lineMode = aController.eid("CompactHeader_checkboxCompactTwolineView");
+ let lineModeNode = lineMode.node;
+
+ if (lineModeNode.hasAttribute("checked")) {
+ aController.click(lineMode);
+ }
+ close_preferences_dialog(aController);
+}
+
+function subtest_change_twoline(aController) {
+ let lineMode = aController.eid("CompactHeader_checkboxCompactTwolineView");
+ let lineModeNode = lineMode.node;
+
+ if (!lineModeNode.hasAttribute("checked")) {
+ aController.click(lineMode);
+ }
+ close_preferences_dialog(aController);
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git
More information about the Pkg-mozext-commits
mailing list