fix test

discourse · Sep 11, 2014 · 306d31b · 306d31b
1 parent 5cb7c8e
commit 306d31b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/assets/javascripts/discourse/models/user_stream.js b/app/assets/javascripts/discourse/models/user_stream.js
@@ -25,8 +25,8 @@ Discourse.UserStream = Discourse.Model.extend({
     }
 
     if(!filter) {
-      return [Discourse.UserAction.TYPES.posts,
-              Discourse.UserAction.TYPES.topics];
+      return [ Discourse.UserAction.TYPES.topics,
+               Discourse.UserAction.TYPES.posts].join(",");
     }
 
     return filter;

diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js.es6
@@ -18,7 +18,8 @@ test('filterParam', function() {
   var user = Discourse.User.create({id: 1, username: 'eviltrout'});
   var stream = user.get('stream');
 
-  blank(stream.get('filterParam'), "it's blank by default");
+  // defaults to posts/topics
+  equal(stream.get('filterParam'), "4,5");
 
   stream.set('filter', Discourse.UserAction.TYPES.likes_given);
   equal(stream.get('filterParam'), Discourse.UserAction.TYPES.likes_given);