Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb

1 files changed, 21 insertions, 15 deletions

diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 65124fcf2..26b131977 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -8,24 +8,30 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
   before do
     allow(view).to receive(:site_hostname).and_return('example.com')
     allow(view).to receive(:site_title).and_return('example site')
+    allow(view).to receive(:new_user).and_return(User.new)
+    allow(view).to receive(:use_seamless_external_login?).and_return(false)
   end
 
   it 'has valid open graph tags' do
-    instance_presenter = double(:instance_presenter,
-                                site_title: 'something',
-                                site_short_description: 'something',
-                                site_description: 'something',
-                                version_number: '1.0',
-                                source_url: 'https://github.com/tootsuite/mastodon',
-                                open_registrations: false,
-                                thumbnail: nil,
-                                hero: nil,
-                                mascot: nil,
-                                user_count: 0,
-                                status_count: 0,
-                                commit_hash: commit_hash,
-                                contact_account: nil,
-                                closed_registrations_message: 'yes')
+    instance_presenter = double(
+      :instance_presenter,
+      site_title: 'something',
+      site_short_description: 'something',
+      site_description: 'something',
+      version_number: '1.0',
+      source_url: 'https://github.com/tootsuite/mastodon',
+      open_registrations: false,
+      thumbnail: nil,
+      hero: nil,
+      mascot: nil,
+      user_count: 420,
+      status_count: 69,
+      active_user_count: 420,
+      commit_hash: commit_hash,
+      contact_account: nil,
+      sample_accounts: []
+    )
+
     assign(:instance_presenter, instance_presenter)
     render