Revert "DEV: Remove the remaining ENV["TRAVIS"] usage (#10041)"

This reverts commit 78aff841e3.

See https://review.discourse.org/t/dev-remove-the-remaining-env-travis-usage-10041/12737/4?u=cvx

spec/models/optimized_image_spec.rb

@@ -6,29 +6,31 @@ describe OptimizedImage do
   let(:upload) { build(:upload) }
   before { upload.id = 42 }
 
-  describe '.crop' do
-    it 'should produce cropped images (requires ImageMagick 7)' do
-      tmp_path = "/tmp/cropped.png"
+  unless ENV["TRAVIS"]
+    describe '.crop' do
+      it 'should produce cropped images (requires ImageMagick 7)' do
+        tmp_path = "/tmp/cropped.png"
 
-      begin
-        OptimizedImage.crop(
-          "#{Rails.root}/spec/fixtures/images/logo.png",
-          tmp_path,
-          5,
-          5
-        )
+        begin
+          OptimizedImage.crop(
+            "#{Rails.root}/spec/fixtures/images/logo.png",
+            tmp_path,
+            5,
+            5
+          )
 
-        # we don't want to deal with something new here every time image magick
-        # is upgraded or pngquant is upgraded, lets just test the basics ...
-        # cropped image should be less than 120 bytes
+          # we don't want to deal with something new here every time image magick
+          # is upgraded or pngquant is upgraded, lets just test the basics ...
+          # cropped image should be less than 120 bytes
 
-        cropped_size = File.size(tmp_path)
+          cropped_size = File.size(tmp_path)
 
-        expect(cropped_size).to be < 120
-        expect(cropped_size).to be > 50
+          expect(cropped_size).to be < 120
+          expect(cropped_size).to be > 50
 
-      ensure
-        File.delete(tmp_path) if File.exists?(tmp_path)
+        ensure
+          File.delete(tmp_path) if File.exists?(tmp_path)
+        end
       end
     end
 

spec/requests/user_avatars_controller_spec.rb

@@ -24,45 +24,48 @@ describe UserAvatarsController do
       after do
         FileUtils.rm(Discourse.store.path_for(upload))
       end
+      # travis is not good here, no image magick
+      if !ENV["TRAVIS"]
+        let :upload do
+          File.open(file_from_fixtures("cropped.png")) do |f|
+            UploadCreator.new(
+              f,
+              "test.png"
+            ).create_for(-1)
+          end
+        end
 
-      let :upload do
-        File.open(file_from_fixtures("cropped.png")) do |f|
-          UploadCreator.new(
-            f,
-            "test.png"
-          ).create_for(-1)
+        let :user do
+          user = Fabricate(:user)
+          user.user_avatar.update_columns(custom_upload_id: upload.id)
+          user.update_columns(uploaded_avatar_id: upload.id)
+          user
+        end
+
+        it 'automatically corrects bad avatar extensions' do
+          orig = Discourse.store.path_for(upload)
+
+          upload.update_columns(
+            original_filename: 'bob.jpg',
+            extension: 'jpg',
+            url: upload.url + '.jpg'
+          )
+
+          # at this point file is messed up
+          FileUtils.mv(orig, Discourse.store.path_for(upload))
+
+          SiteSetting.avatar_sizes = "50"
+
+          get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
+
+          expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
+          expect(response.status).to eq(200)
+
+          upload.reload
+          expect(upload.extension).to eq('png')
         end
       end
 
-      let :user do
-        user = Fabricate(:user)
-        user.user_avatar.update_columns(custom_upload_id: upload.id)
-        user.update_columns(uploaded_avatar_id: upload.id)
-        user
-      end
-
-      it 'automatically corrects bad avatar extensions' do
-        orig = Discourse.store.path_for(upload)
-
-        upload.update_columns(
-          original_filename: 'bob.jpg',
-          extension: 'jpg',
-          url: upload.url + '.jpg'
-        )
-
-        # at this point file is messed up
-        FileUtils.mv(orig, Discourse.store.path_for(upload))
-
-        SiteSetting.avatar_sizes = "50"
-
-        get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
-
-        expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
-        expect(response.status).to eq(200)
-
-        upload.reload
-        expect(upload.extension).to eq('png')
-      end
     end
 
     it 'handles non local content correctly' do