about summary refs log tree commit diff
path: root/spec/views/about
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
commitbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /spec/views/about
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parent4da03a298a20e5007718764483544593556a5ed4 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/settings.yml
Diffstat (limited to 'spec/views/about')
-rw-r--r--spec/views/about/show.html.haml_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 0f4d79569..e15c72cec 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -13,6 +13,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
   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',