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

3 files changed, 32 insertions, 18 deletions

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index a43421b76..379872316 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -558,6 +558,11 @@ RSpec.describe Account, type: :model do
       expect(account).to model_have_error_on_field(:username)
     end
 
+    it 'squishes the username before validation' do
+      account = Fabricate(:account, domain: nil, username: " \u3000bob \t \u00a0 \n ")
+      expect(account.username).to eq 'bob'
+    end
+
     context 'when is local' do
       it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do
         account_1 = Fabricate(:account, username: 'the_doctor')
diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb
index f625a93a4..496a885e8 100644
--- a/spec/requests/localization_spec.rb
+++ b/spec/requests/localization_spec.rb
@@ -11,8 +11,9 @@ describe 'Localization' do
     headers = { 'Accept-Language' => 'zh-HK' }
 
     get "/about", headers: headers
+
     expect(response.body).to include(
-      I18n.t('about.about_mastodon_html', locale: 'zh-HK')
+      I18n.t('about.tagline', locale: 'zh-HK')
     )
   end
 
@@ -20,16 +21,18 @@ describe 'Localization' do
     headers = { 'Accept-Language' => 'es-FAKE' }
 
     get "/about", headers: headers
+
     expect(response.body).to include(
-      I18n.t('about.about_mastodon_html', locale: 'es')
+      I18n.t('about.tagline', locale: 'es')
     )
   end
   it 'falls back to english when locale is missing' do
     headers = { 'Accept-Language' => '12-FAKE' }
 
     get "/about", headers: headers
+
     expect(response.body).to include(
-      I18n.t('about.about_mastodon_html', locale: 'en')
+      I18n.t('about.tagline', locale: 'en')
     )
   end
 end
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