From 2aae0f0d8ba03e0e0f6a8db88ae72244acef1d9a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 17 Aug 2020 11:32:56 -0400 Subject: [PATCH] FIX: This leaves an empty example group in TRAVIS mode Instead we should remove the entire context. --- spec/requests/user_avatars_controller_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb index 4f639fd15ba..8ba24ce186f 100644 --- a/spec/requests/user_avatars_controller_spec.rb +++ b/spec/requests/user_avatars_controller_spec.rb @@ -20,12 +20,13 @@ describe UserAvatarsController do context 'show' do - context 'invalid' do - after do - FileUtils.rm(Discourse.store.path_for(upload)) - end - # travis is not good here, no image magick - if !ENV["TRAVIS"] + # travis is not good here, no image magick + if !ENV["TRAVIS"] + context 'invalid' do + after do + FileUtils.rm(Discourse.store.path_for(upload)) + end + let :upload do File.open(file_from_fixtures("cropped.png")) do |f| UploadCreator.new( @@ -65,7 +66,6 @@ describe UserAvatarsController do expect(upload.extension).to eq('png') end end - end it 'handles non local content correctly' do