From 02fb632efe9c6fb00e386af8fea692184a6d0f6a Mon Sep 17 00:00:00 2001 From: Kate Goss Date: Sat, 18 Feb 2012 20:49:17 +0000 Subject: [PATCH] fdo#42006: Make Bugzilla Assistant tests pass in IE8 --- bug/bug/bug.js | 9 +++++---- bug/bug/test.js | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bug/bug/bug.js b/bug/bug/bug.js index b2e4ed6..d670092 100644 --- a/bug/bug/bug.js +++ b/bug/bug/bug.js @@ -208,10 +208,11 @@ element.show(); } }, - - state_submit_error_regexps: [/CLASS="THROW_ERROR">([^<]*)/i, /FONT SIZE=\"\+2\">([^<]*)/i, // bugzilla < 4 - /
\s+

([^<]+)/i], // bugzilla >= 4 - state_submit_success_regexp: /TITLE>Bug ([0-9]+)/i, + // Making the double quotes optional caters for differing browser + // behaviour with jquery .text() - IE8 removes double quotes. + state_submit_error_regexps: [/CLASS="?THROW_ERROR"?>([^<]*)/i, /FONT SIZE=\"?\+2\"?>([^<]*)/i, // bugzilla < 4 + /

\s+

([^<]+)/i], // bugzilla >= 4 + state_submit_success_regexp: /Bug ([0-9]+)/i, state_submit_element: 'html', state_submit: function() { diff --git a/bug/bug/test.js b/bug/bug/test.js index 93daea0..8c26d34 100644 --- a/bug/bug/test.js +++ b/bug/bug/test.js @@ -274,12 +274,13 @@ test("state_submit", function() { $.bug.state_submit_element = 'div'; // because can't be inserted in the dom - $('#submissionoutput').html('

Bug ' + bug + ' Submitted
'); + // cannot be inserted by IE8 + $('#submissionoutput').html('<div><div>Bug ' + bug + ' Submitted</div></div>'); $('#submissionoutput').load(); equal($('.bug', element).text(), bug, 'bug number'); ok(!element.hasClass('inprogress'), 'is no longer progress'); - - var error = ' ERROR '; + + var error = 'ERROR'; equal($('.error').text(), '', 'error is not set'); // make sure you enclose the useful elements with <div><div> ... </div></div> -- 1.7.9.msysgit.0