diff --git a/spec/factories.rb b/spec/factories.rb
index 7b446f3a0..63d870fd9 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -6,8 +6,9 @@ FactoryGirl.define do
     sequence(:email)    { |n| "manuela#{n}@consul.dev" }
 
     password            'judgmentday'
-    terms_of_service     '1'
+    terms_of_service    '1'
     confirmed_at        { Time.current }
+    public_activity     true
 
     trait :incomplete_verification do
       after :create do |user|
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d7235dc86..a76765cc5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -351,6 +351,18 @@ describe User do
       end
 
     end
+
+    describe "public activity" do
+      it "returns users whose activity feed is public" do
+        user1 = create(:user)
+        user2 = create(:user, public_activity: false)
+        user3 = create(:user)
+
+        expect(User.public_activity).to include(user1)
+        expect(User.public_activity).not_to include(user2)
+        expect(User.public_activity).to include(user3)
+      end
+    end
   end
 
   describe "self.search" do