Merge branch 'fix/user-count' into 'master'

Fix active user count

See merge request !10783

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9de16c41e94..6af5ef1018c 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1631,4 +1631,16 @@ describe User, models: true do
       end
     end
   end
+
+  context '.active' do
+    before do
+      User.ghost
+      create(:user, name: 'user', state: 'active')
+      create(:user, name: 'user', state: 'blocked')
+    end
+
+    it 'only counts active and non internal users' do
+      expect(User.active.count).to eq(1)
+    end
+  end
 end