Skip to content

Commit 477b61a

Browse files
Fix some IE6 test failures.
1 parent 0de22ea commit 477b61a

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

test.new/tests/dom.test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,11 +1042,11 @@ suite('DOM', function () {
10421042
if (!STANDARD_CSS_OPACITY_SUPPORTED) {
10431043
// Run these tests only on older versions of IE. IE9 and 10 dropped
10441044
// support for filters and therefore fail these tests.
1045-
assert.equal('alpha(opacity=30)', $('op1').getStyle('filter'));
1046-
assert.equal('progid:DXImageTransform.Microsoft.Blur(strength=10)alpha(opacity=30)', $('op2').getStyle('filter'));
1045+
assert.equal('alpha(opacity=30)', $('op1').getStyle('filter').strip());
1046+
assert.equal('progid:DXImageTransform.Microsoft.Blur(strength=10) alpha(opacity=30)', $('op2').getStyle('filter'));
10471047
$('op2').setStyle({opacity:''});
1048-
assert.equal('progid:DXImageTransform.Microsoft.Blur(strength=10)', $('op2').getStyle('filter'));
1049-
assert.equal('alpha(opacity=0)', $('op3').getStyle('filter'));
1048+
assert.equal('progid:DXImageTransform.Microsoft.Blur(strength=10)', $('op2').getStyle('filter').strip());
1049+
assert.equal('alpha(opacity=0)', $('op3').getStyle('filter').strip());
10501050
assert.equal(0.3, $('op4-ie').getStyle('opacity'));
10511051
}
10521052

@@ -1191,7 +1191,7 @@ suite('DOM', function () {
11911191
checkedCheckbox = $('write_attribute_checked_checkbox');
11921192
assert( checkbox. writeAttribute('checked'). checked);
11931193
assert( checkbox. writeAttribute('checked'). hasAttribute('checked'));
1194-
assert.equal('checked', checkbox.writeAttribute('checked').getAttribute('checked'));
1194+
assert.equal('checked', checkbox.writeAttribute('checked').readAttribute('checked'));
11951195
assert(!checkbox. writeAttribute('checked'). hasAttribute('undefined'));
11961196
assert( checkbox. writeAttribute('checked', true). checked);
11971197
assert( checkbox. writeAttribute('checked', true). hasAttribute('checked'));
@@ -1275,7 +1275,7 @@ suite('DOM', function () {
12751275
assert.equal(tag, element.tagName.toLowerCase());
12761276
assert.equal(element, document.body.lastChild);
12771277
assert.equal(id, element.id);
1278-
element.remove();
1278+
Element.remove(element);
12791279
}, this);
12801280

12811281

test.new/tests/form.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ suite('Form', function () {
44
this.name = 'form';
55

66
setup(function () {
7-
$$('div.form-tests form').invoke('reset');
7+
// $$('div.form-tests form').invoke('reset');
8+
$$('div.form-tests form').each(function (f) {
9+
Form.reset(f);
10+
});
811
// for some reason, hidden value does not reset
912
$('form-test-bigform')['tf_hidden'].value = '';
1013
});

test.new/tests/layout.test.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,12 @@ suite("Layout",function(){
390390
test('#getDimensions', function () {
391391
var original = document.viewport.getDimensions();
392392

393-
window.resizeTo(800, 600);
393+
try {
394+
window.resizeTo(800, 600);
395+
} catch (e) {
396+
info("Can't resize.");
397+
return;
398+
}
394399

395400
wait(1000, function() {
396401
var before = document.viewport.getDimensions();

0 commit comments

Comments
 (0)