Make test more robust to other tests leaving things in a bad state.

ybak · Dec 5, 2013 · 3229b36 · 3229b36
1 parent d1cb374
commit 3229b36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/livedata/livedata_test_service.js b/packages/livedata/livedata_test_service.js
@@ -42,7 +42,7 @@ Meteor.methods({
     }
   },
   setUserId: function(userId) {
-    check(userId, String);
+    check(userId, Match.OneOf(String, null));
     this.setUserId(userId);
   }
 });

diff --git a/packages/livedata/livedata_tests.js b/packages/livedata/livedata_tests.js
@@ -365,6 +365,10 @@ if (Meteor.isClient) {
         messages.length = 0; // clear messages without creating a new object
       };
 
+      // make sure we're not already logged in. can happen if accounts
+      // tests fail oddly.
+      Meteor.apply("setUserId", [null], {wait: true}, expect(function () {}));
+
       Meteor.subscribe("objectsWithUsers", expect(function() {
         expectMessages(1, 0, ["owned by none"]);
         Meteor.apply("setUserId", ["1"], {wait: true}, afterFirstSetUserId);
@@ -406,6 +410,8 @@ if (Meteor.isClient) {
         test.isFalse(err);
         test.equal(result, "100");
       }));
+      // clean up
+      Meteor.apply("setUserId", [null], {wait: true}, expect(function () {}));
     }
   ]);
 }