1 files changed, 11 insertions, 31 deletions

diff --git a/spec/models/ci/build_trace_chunks/fog_spec.rb b/spec/models/ci/build_trace_chunks/fog_spec.rb
index 21dab6fad60..bbf04ef9430 100644
--- a/spec/models/ci/build_trace_chunks/fog_spec.rb
+++ b/spec/models/ci/build_trace_chunks/fog_spec.rb
@@ -107,37 +107,22 @@ RSpec.describe Ci::BuildTraceChunks::Fog do
     let(:model) { create(:ci_build_trace_chunk, :fog_with_data, initial_data: initial_data) }
     let(:data) { data_store.data(model) }
 
-    context 'when ci_job_trace_force_encode is enabled' do
-      it 'appends ASCII data' do
-        data_store.append_data(model, +'hello world', 4)
+    it 'appends ASCII data' do
+      data_store.append_data(model, +'hello world', 4)
 
-        expect(data.encoding).to eq(Encoding::ASCII_8BIT)
-        expect(data.force_encoding(Encoding::UTF_8)).to eq('😺hello world')
-      end
-
-      it 'appends UTF-8 data' do
-        data_store.append_data(model, +'Résumé', 4)
-
-        expect(data.encoding).to eq(Encoding::ASCII_8BIT)
-        expect(data.force_encoding(Encoding::UTF_8)).to eq("😺Résumé")
-      end
-
-      context 'when initial data is UTF-8' do
-        let(:initial_data) { +'😺' }
+      expect(data.encoding).to eq(Encoding::ASCII_8BIT)
+      expect(data.force_encoding(Encoding::UTF_8)).to eq('😺hello world')
+    end
 
-        it 'appends ASCII data' do
-          data_store.append_data(model, +'hello world', 4)
+    it 'appends UTF-8 data' do
+      data_store.append_data(model, +'Résumé', 4)
 
-          expect(data.encoding).to eq(Encoding::ASCII_8BIT)
-          expect(data.force_encoding(Encoding::UTF_8)).to eq('😺hello world')
-        end
-      end
+      expect(data.encoding).to eq(Encoding::ASCII_8BIT)
+      expect(data.force_encoding(Encoding::UTF_8)).to eq("😺Résumé")
     end
 
-    context 'when ci_job_trace_force_encode is disabled' do
-      before do
-        stub_feature_flags(ci_job_trace_force_encode: false)
-      end
+    context 'when initial data is UTF-8' do
+      let(:initial_data) { +'😺' }
 
       it 'appends ASCII data' do
         data_store.append_data(model, +'hello world', 4)
@@ -145,11 +130,6 @@ RSpec.describe Ci::BuildTraceChunks::Fog do
         expect(data.encoding).to eq(Encoding::ASCII_8BIT)
         expect(data.force_encoding(Encoding::UTF_8)).to eq('😺hello world')
       end
-
-      it 'throws an exception when appending UTF-8 data' do
-        expect(Gitlab::ErrorTracking).to receive(:track_and_raise_exception).and_call_original
-        expect { data_store.append_data(model, +'Résumé', 4) }.to raise_exception(Encoding::CompatibilityError)
-      end
     end
   end