Merge pull request #553 from jvanbaarsen/fix-295

Only update trace when trace is given

2 files changed, 8 insertions, 1 deletions

diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index ba40c89..c4bcf88 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -32,7 +32,7 @@ module API
       put ":id" do
         authenticate_runner!
         build = Build.where(runner_id: current_runner.id).running.find(params[:id])
-        build.update_attributes(trace: params[:trace])
+        build.update_attributes(trace: params[:trace]) if params[:trace]
 
         case params[:state].to_s
         when 'success'
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index d58441e..fd0e0cd 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -60,6 +60,13 @@ describe API::API do
         put api("/builds/#{build.id}"), token: runner.token
         response.status.should == 200
       end
+
+      it 'Should not override trace information when no trace is given' do
+        build.run!
+        build.update!(trace: 'hello_world')
+        put api("/builds/#{build.id}"), token: runner.token
+        expect(build.reload.trace).to eq 'hello_world'
+      end
     end
   end