[Pkg-mozext-commits] [compactheader] 376/441: Version 2.0.7beta2: Fix problem with mail.chat.enabled preferences.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:19 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 6ac6a3f8e850eb3d73a069b75c9d313fd1dac32a
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Sat Sep 22 21:50:28 2012 +0200
Version 2.0.7beta2: Fix problem with mail.chat.enabled preferences.
---
.../CompactHeader/content/compactHeaderOverlay.js | 12 +++--
install.rdf | 2 +-
test/compactheader/test-compactheader-collapse.js | 56 +++++++++++++++++++---
test/executeTests.pl | 17 ++++---
4 files changed, 70 insertions(+), 17 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index c21c621..f98e442 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -106,7 +106,7 @@ org.mozdev.compactHeader.pane = function() {
var coheFirstTime = true;
var headerFirstTime = true;
-
+
var pressMores = null;
var gMoreTooltip = "";
@@ -245,7 +245,7 @@ org.mozdev.compactHeader.pane = function() {
}
pressMores = null;
}
-
+
pub.coheOnLoadMsgHeaderPane = function() {
org.mozdev.compactHeader.debug.log("coheOnLoadMsgHeaderPane start");
@@ -296,7 +296,13 @@ org.mozdev.compactHeader.pane = function() {
if (collapsed2LtoCcBccBox) {
let updateEmailAddressNodeFunction = collapsed2LtoCcBccBox.updateEmailAddressNode;
function updateEmailAddressNodeNew(aEmailNode, aAddress) {
- updateEmailAddressNode(aEmailNode, aAddress)
+ try {
+ updateEmailAddressNodeFunction(aEmailNode, aAddress);
+ }
+ catch(e) {
+ org.mozdev.compactHeader.debug.log("got execption " + e +
+ " from updateEmailAddressNode");
+ }
aEmailNode.setAttribute("addressType", aAddress.addressType);
}
collapsed2LtoCcBccBox.updateEmailAddressNode = updateEmailAddressNodeNew;
diff --git a/install.rdf b/install.rdf
index 4ab86cf..90d527b 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.7beta1</em:version>
+ <em:version>2.0.7beta2</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-collapse.js b/test/compactheader/test-compactheader-collapse.js
index 8ef20e3..6bac438 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -42,6 +42,8 @@ var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
'address-book-helpers', 'mouse-event-helpers',
'compactheader-helpers'];
+const ENABLE_CHAT_PREF="mail.chat.enabled";
+
var elib = {};
Cu.import('resource://mozmill/modules/elementslib.js', elib);
var controller = {};
@@ -115,7 +117,14 @@ function setupModule(module) {
to: msgGen.makeNamesAndAddresses(1)
});
add_message_to_folder(folder1, msg);
+}
+function teardownModule() {
+ Services.prefs.clearUserPref(ENABLE_CHAT_PREF);
+ let abwc = openAddressBook();
+ close3PaneWindow();
+ mc = open3PaneWindow();
+ abwc.window.close();
}
function test_wide_layout_and_compact() {
@@ -297,7 +306,7 @@ function test_address_type_order(){
mc.sleep(10);
collapse_and_assert_header(mc);
select_message_in_folder(folder1, 2, mc);
-
+
let toCcBccDescription = mc.a('CompactHeader_collapsed2LtoCcBccBox', {class: "headerValue"});
let addrs = toCcBccDescription.getElementsByTagName('mail-emailaddress');
@@ -321,7 +330,7 @@ function test_addresses_do_not_double(){
select_message_in_folder(folder1, 3, mc);
let addrs;
-
+
let fromDescription = mc.a('expandedfromBox', {class: "headerValue"});
addrs = fromDescription.getElementsByTagName('mail-emailaddress');
let firstFromAddrNum = 0;
@@ -330,7 +339,7 @@ function test_addresses_do_not_double(){
firstFromAddrNum += 1;
}
}
-
+
let toDescription = mc.a('expandedtoBox', {class: "headerValue"});
addrs = toDescription.getElementsByTagName('mail-emailaddress');
let firstToAddrNum = 0;
@@ -339,7 +348,7 @@ function test_addresses_do_not_double(){
firstToAddrNum += 1;
}
}
-
+
let ccDescription = mc.a('expandedccBox', {class: "headerValue"});
addrs = ccDescription.getElementsByTagName('mail-emailaddress');
let firstCCAddrNum = 0;
@@ -351,7 +360,7 @@ function test_addresses_do_not_double(){
collapse_and_assert_header(mc);
expand_and_assert_header(mc);
-
+
addrs = fromDescription.getElementsByTagName('mail-emailaddress');
let secondFromAddrNum = 0;
for (let i = 0; i<addrs.length; i++) {
@@ -367,7 +376,7 @@ function test_addresses_do_not_double(){
secondToAddrNum += 1;
}
}
-
+
addrs = ccDescription.getElementsByTagName('mail-emailaddress');
let secondCCAddrNum = 0;
for (let i = 0; i<addrs.length; i++) {
@@ -375,7 +384,7 @@ function test_addresses_do_not_double(){
secondCCAddrNum += 1;
}
}
-
+
assert_true(firstFromAddrNum == secondFromAddrNum, "number of from addresses changed from " +
firstFromAddrNum + " to " + secondFromAddrNum);
assert_true(firstToAddrNum == secondToAddrNum, "number of to addresses changed from " +
@@ -384,3 +393,36 @@ function test_addresses_do_not_double(){
firstCCAddrNum + " to " + secondCCAddrNum);
Services.prefs.clearUserPref(MORE_PREF);
}
+
+function test_toCcBcc_without_chat_enabled(){
+ select_message_in_folder(folder1, 0, mc);
+ open_preferences_dialog(mc, set_preferences_twoline);
+
+ Services.prefs.setBoolPref(ENABLE_CHAT_PREF, false);
+
+ let abwc = openAddressBook();
+ close3PaneWindow();
+ mc = open3PaneWindow();
+ abwc.window.close();
+
+ let msg = create_message({
+ subject: "This is a short subject.",
+ to: [["U Ull", "u.ull at t.invalid"]],
+ clobberHeaders: {
+ "cc": "W Wer <w.wer at s.invalid>",
+ },
+ });
+ add_message_to_folder(folder1, msg);
+ select_message_in_folder(folder1, -1, mc);
+
+ mc.sleep(10);
+ collapse_and_assert_header(mc);
+
+ let toDescription = mc.a('CompactHeader_collapsed2LtoCcBccBox', {class: "headerValue"});
+ let addrs = toDescription.getElementsByTagName('mail-emailaddress');
+ for (let i=0; i<addrs.length; i++) {
+ let labels = mc.window.document.getAnonymousElementByAttribute(
+ addrs[i], "anonid", "emaillabel");
+ assert_true(labels.value.length > 0);
+ }
+}
diff --git a/test/executeTests.pl b/test/executeTests.pl
index 1b91189..3c7f4c0 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -57,8 +57,10 @@ my ($unpack, $unpackargs, $unpacktargetargs, $appbin, $virtualpython);
my ($sysname, $nodename, $release, $osversion, $machine) = POSIX::uname();
my ($testversion);
+my ($downloadonly);
-GetOptions('version:s' => \$testversion);
+GetOptions('version:s' => \$testversion,
+ 'downloadonly' => \$downloadonly);
open (F, $file) || die ("Could not open $file!");
@@ -188,9 +190,14 @@ while (my $line = <F>)
} # correct OS/architecture
} # different versions
+close (F);
foreach my $pid (@children) {
waitpid($pid, 0);
+
+ if ($downloadonly) {
+ exit 0;
+ }
my $currentdir = getcwd;
$version = $testSpecs{$pid}{version};
@@ -223,11 +230,11 @@ foreach my $pid (@children) {
my @compatibility_apps = (
glob("../../ftp//$ostype-$hosttype-$version/lightning*.xpi"),
"../../$dispMUAfile",
-# "../../$mnenhyfile" # activate when mozmill can handle this addon:
+# "../../$mnenhyfile" # activate when mozmill can handle this addon:
);
-
+
my $comp_apps = join(",", @compatibility_apps);
-
+
print $comp_apps;
# print "$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1\n";
$log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1`;
@@ -254,8 +261,6 @@ foreach my $pid (@children) {
print "\n\n";
}
-close (F);
-
sub parse_csv {
my $text = shift;
my @new = ();
--
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