about summary refs log tree commit diff
path: root/spec/controllers/api/v1/timelines/public_controller_spec.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-09-15 14:45:24 +0200
committerGitHub <noreply@github.com>2019-09-15 14:45:24 +0200
commit221bb05cf8d30d7912fd1f860af2552ff7914fd2 (patch)
tree88ac4e45536fe772a1c47bdf6df27c6ad19a016f /spec/controllers/api/v1/timelines/public_controller_spec.rb
parentc7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff)
parentb83e2df6b59ccd7cbe8f9145e06b75547dc1101a (diff)
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/api/v1/timelines/public_controller_spec.rb')
-rw-r--r--spec/controllers/api/v1/timelines/public_controller_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/api/v1/timelines/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb
index 737aedba6..b8e9d8674 100644
--- a/spec/controllers/api/v1/timelines/public_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb
@@ -44,6 +44,10 @@ describe Api::V1::Timelines::PublicController do
   context 'without a user context' do
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil) }
 
+    before do
+      Setting.timeline_preview = true
+    end
+
     describe 'GET #show' do
       it 'returns http success' do
         get :show