Merge pull request #16 from onlymezyb/master

Fix 3 test cases failed when run test example nuve-test.js
lynckia · Jul 3, 2013 · b014a1e · b014a1e
2 parents f5c407b + cc467c0
commit b014a1e
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/test/nuve-test.js b/test/nuve-test.js
@@ -69,6 +69,7 @@ describe('server', function () {
 
         room.connect();
 
+        room.publish(localStream);
         waitsFor(function () {
             return callback.callCount > 0;
         });
@@ -81,10 +82,10 @@ describe('server', function () {
     it('should publish stream in room', function () {
         var callback = jasmine.createSpy("publishroom");
 
-        room.publish(localStream);
-
+         waits(20000);
         room.addEventListener("stream-added", function(msg) {
-            remoteStream = msg.stream;
+            remoteStream = [];
+            remoteStream.push(msg.stream);
             callback();
         });
 
@@ -103,12 +104,14 @@ describe('server', function () {
         room.addEventListener("stream-subscribed", function() {
             callback();
         });
-
-        room.subscribe(remoteStream);
-
+
+         for (var index in remoteStream) {
+             var stream = remoteStream[index];
+             room.subscribe(stream);
+          }
         waitsFor(function () {
             return callback.callCount > 0;
-        });
+        },"stream-subscribed should trigged", 20000);
 
         runs(function () {
             expect(callback).toHaveBeenCalled();
@@ -120,12 +123,12 @@ describe('server', function () {
         divg.setAttribute("id", "myDiv");
         document.body.appendChild(divg);
 
-        remoteStream.show('myDiv');
+        localStream.show('myDiv');
 
         waits(500);
 
         runs(function () {
-            var video = document.getElementById('stream' + remoteStream.getID());
+            var video = document.getElementById('stream' + localStream.getID());
             expect(video.getAttribute("url")).toBeDefined();
         });
     });
@@ -145,4 +148,4 @@ describe('server', function () {
             expect(callback).toHaveBeenCalled();
         });
     });
-});
+});