Merge remote-tracking branch 'cindyli/FLUID-4593'

* cindyli/FLUID-4593: FLUID-4593: Fixed the failure of intervalEventsConductor integration test in IE9.
fluid-project · Feb 17, 2012 · 6375bf9 · 6375bf9
2 parents f7aab18 + 3e4d093
commit 6375bf9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html b/tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
@@ -27,7 +27,7 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="main">
 
-        <video class="flc-video fl-videoPlayer-video" alt="A video for the intervalEventsConductor integration tests" style="display:none" />
+        <video class="flc-video fl-videoPlayer-video" alt="A video for the intervalEventsConductor integration tests" style="display:none">
             <source src="../../demos/ReorganizeFuture.mp4" type="video/mp4"></source>
             <source src="../../demos/ReorganizeFuture.webm" type="video/webm"></source>
         </video>

diff --git a/tests/js/IntervalEventsConductor-IntegrationTests.js b/tests/js/IntervalEventsConductor-IntegrationTests.js
@@ -35,7 +35,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             }];
         // End of the test data
 
-        videoPlayerIntervalEventsConductorIntegrationTests.asyncTest("Integration test: intervalEventsConductor with html5MediaTimer", function () {
+        videoPlayerIntervalEventsConductorIntegrationTests.asyncTest("Integration test: intervalEventsConductor with html5MediaTimer (This test is expected to fail when running in non-html5 browsers)", function () {
             var videoContainer = $(".flc-video");
             var timeToSet = 1;
             var previousInterval = null;