Commit 55132102 authored by Kamil Trzciński's avatar Kamil Trzciński Committed by Mayra Cabrera
Browse files

Merge branch 'fix/sm/erase_old_trace' into 'master' 

Use update_column than write_attribute and save

Closes #44366

See merge request gitlab-org/gitlab-ce!17861
parent e9613d4a

app/models/ci/build.rb

+1 −2
Original line number Diff line number Diff line
@@ -328,8 +328,7 @@ def old_trace 
    end



    def erase_old_trace!

      write_attribute(:trace, nil)

      save

      update_column(:trace, nil)

    end



    def needs_touch?

spec/lib/gitlab/ci/trace_spec.rb

+22 −0
Original line number Diff line number Diff line
@@ -510,6 +510,28 @@ 


          it_behaves_like 'source trace in database stays intact', error: ActiveRecord::RecordInvalid

        end



        context 'when there is a validation error on Ci::Build' do

          before do

            allow_any_instance_of(Ci::Build).to receive(:save).and_return(false)

            allow_any_instance_of(Ci::Build).to receive_message_chain(:errors, :full_messages)

              .and_return(%w[Error Error])

          end



          context "when erase old trace with 'save'" do

            before do

              build.send(:write_attribute, :trace, nil)

              build.save

            end



            it 'old trace is not deleted' do

              build.reload

              expect(build.trace.raw).to eq(trace_content)

            end

          end



          it_behaves_like 'archive trace in database'

        end

      end

    end