Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTim Buschtöns2011-01-20 16:09:30 +0000
committerTim Buschtöns2011-01-20 16:09:30 +0000
commit1d2d4563ffd636c761c6b4722268f3d797ba20c3 (patch)
tree1afd5b28cf07794c078cb9b2adbded98d6021b1e /tests
parent98d3f26b091812009162c13db487c291c74f01d4 (diff)
downloadorg.eclipse.rap-1d2d4563ffd636c761c6b4722268f3d797ba20c3.tar.gz
org.eclipse.rap-1d2d4563ffd636c761c6b4722268f3d797ba20c3.tar.xz
org.eclipse.rap-1d2d4563ffd636c761c6b4722268f3d797ba20c3.zip
Fix for Bug 334223 - [Browser] Infinity loadind status in FF
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js7
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js7
2 files changed, 6 insertions, 8 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
index fee0804153..147a8b4fa4 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2010,2011 EclipseSource and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -469,13 +469,12 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
assertTrue( iframe.parentNode === el );
wm.dispose( "w6" );
testUtil.flush();
- if( !qx.core.Variant.isSet( "qx.client", "webkit" ) ) {
- // NOTE: Webkit fires the load event immediately
+ if( qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertEquals( "javascript:false;", browser.getSource() );
assertFalse( browser.isDisposed() );
assertIdentical( testUtil.getDocument(), browser.getParent() );
assertTrue( browser.isSeeable() );
}
- assertEquals( "javascript:false;", browser.getSource() );
assertTrue( wm.findWidgetById( "w6" ) == null ); /* may be undefined */
testUtil.delayTest( 300 );
testUtil.store( browser, el, iframe );
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
index fee0804153..147a8b4fa4 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2010,2011 EclipseSource and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -469,13 +469,12 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
assertTrue( iframe.parentNode === el );
wm.dispose( "w6" );
testUtil.flush();
- if( !qx.core.Variant.isSet( "qx.client", "webkit" ) ) {
- // NOTE: Webkit fires the load event immediately
+ if( qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertEquals( "javascript:false;", browser.getSource() );
assertFalse( browser.isDisposed() );
assertIdentical( testUtil.getDocument(), browser.getParent() );
assertTrue( browser.isSeeable() );
}
- assertEquals( "javascript:false;", browser.getSource() );
assertTrue( wm.findWidgetById( "w6" ) == null ); /* may be undefined */
testUtil.delayTest( 300 );
testUtil.store( browser, el, iframe );

Back to the top