From bcd804f44dfc776f00518d83eb0fa7e48a6cb6ef Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 19 Aug 2021 10:55:40 -0400 Subject: [PATCH] Add user count to instance API (#14543) * Add user count to instance API * Use estimated_count --- app/controllers/api/v0/instances_controller.rb | 1 + spec/requests/api/v0/instances_spec.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/api/v0/instances_controller.rb b/app/controllers/api/v0/instances_controller.rb index c333de29f..570045c46 100644 --- a/app/controllers/api/v0/instances_controller.rb +++ b/app/controllers/api/v0/instances_controller.rb @@ -9,6 +9,7 @@ module Api description: Settings::Community.community_description, logo_image_url: Settings::General.logo_png, name: Settings::Community.community_name, + registered_users_count: User.registered.estimated_count, tagline: Settings::Community.tagline, version: "edge.#{Time.now.utc.strftime('%Y%m%d')}.0", visibility: visibility diff --git a/spec/requests/api/v0/instances_spec.rb b/spec/requests/api/v0/instances_spec.rb index bd6bb394b..91fd73214 100644 --- a/spec/requests/api/v0/instances_spec.rb +++ b/spec/requests/api/v0/instances_spec.rb @@ -3,12 +3,14 @@ require "rails_helper" RSpec.describe "Api::V0::Instances", type: :request do describe "GET /api/instance" do it "returns the correct attributes", :aggregate_failures do + create(:user) get api_instance_path expect(response.parsed_body["cover_image_url"]).to eq Settings::General.main_social_image expect(response.parsed_body["description"]).to eq Settings::Community.community_description expect(response.parsed_body["logo_image_url"]).to eq Settings::General.logo_png expect(response.parsed_body["name"]).to eq Settings::Community.community_name + expect(response.parsed_body["registered_users_count"]).to eq User.registered.estimated_count expect(response.parsed_body["tagline"]).to eq Settings::Community.tagline expect(response.parsed_body["version"]).to match(/(stable|beta|edge)\.\d{8}\.\d+/) expect(response.parsed_body["visibility"]).to eq "public"