From 5c6e705012c8759240099a5f8b75c049edd3baa2 Mon Sep 17 00:00:00 2001
From: carlad <carla@travis-ci.com>
Date: Wed, 30 Sep 2015 15:21:59 +0200
Subject: [PATCH] v3 update sidekiq payload for build restart and cancel

---
 lib/travis/api/v3/queries/build.rb     |  4 ++--
 spec/v3/services/build/cancel_spec.rb  | 18 ++++++++----------
 spec/v3/services/build/restart_spec.rb | 18 ++++++++----------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/lib/travis/api/v3/queries/build.rb b/lib/travis/api/v3/queries/build.rb
index 6cd5cee4..350f02b1 100644
--- a/lib/travis/api/v3/queries/build.rb
+++ b/lib/travis/api/v3/queries/build.rb
@@ -8,13 +8,13 @@ module Travis::API::V3
     end
 
     def cancel(user)
-      payload = {build: {id: id, user_id: user.id, source: 'api'}}
+      payload = {id: id, user_id: user.id, source: 'api'}
       perform_async(:build_cancellation, type: 'api'.freeze, payload: JSON.dump(payload))
       payload
     end
 
     def restart(user)
-      payload = {build: {id: id, user_id: user.id, source: 'api'}}
+      payload = {id: id, user_id: user.id, source: 'api'}
       perform_async(:build_restart, type: 'api'.freeze, payload: JSON.dump(payload))
       payload
     end
diff --git a/spec/v3/services/build/cancel_spec.rb b/spec/v3/services/build/cancel_spec.rb
index 3f37b633..db32e36a 100644
--- a/spec/v3/services/build/cancel_spec.rb
+++ b/spec/v3/services/build/cancel_spec.rb
@@ -97,11 +97,10 @@ describe Travis::API::V3::Services::Build::Cancel do
     }
 
     example { expect(sidekiq_payload).to be == {
-      "build"    => {
-        "id"     => "#{build.id}",
-        "user_id"=> repo.owner_id,
-        "source" => "api"}
-    }}
+      "id"     => "#{build.id}",
+      "user_id"=> repo.owner_id,
+      "source" => "api"}
+    }
 
     example { expect(Sidekiq::Client.last['queue']).to be == 'build_cancellations'                }
     example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Sidekiq::BuildCancellation' }
@@ -109,11 +108,10 @@ describe Travis::API::V3::Services::Build::Cancel do
     describe "setting id has no effect" do
       let(:params) {{ id: 42 }}
       example { expect(sidekiq_payload).to be == {
-        "build"    => {
-          "id"     => "#{build.id}",
-          "user_id"=> repo.owner_id,
-          "source" => "api"}
-      }}
+        "id"     => "#{build.id}",
+        "user_id"=> repo.owner_id,
+        "source" => "api"}
+      }
     end
   end
 
diff --git a/spec/v3/services/build/restart_spec.rb b/spec/v3/services/build/restart_spec.rb
index a5d4d662..14ba5ce3 100644
--- a/spec/v3/services/build/restart_spec.rb
+++ b/spec/v3/services/build/restart_spec.rb
@@ -98,11 +98,10 @@ describe Travis::API::V3::Services::Build::Restart do
     }
 
     example { expect(sidekiq_payload).to be == {
-      "build"    => {
-        "id"     => "#{build.id}",
-        "user_id"=> repo.owner_id,
-        "source" => "api"}
-    }}
+      "id"     => "#{build.id}",
+      "user_id"=> repo.owner_id,
+      "source" => "api"}
+    }
 
     example { expect(Sidekiq::Client.last['queue']).to be == 'build_restarts'                }
     example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Sidekiq::BuildRestart' }
@@ -110,11 +109,10 @@ describe Travis::API::V3::Services::Build::Restart do
     describe "setting id has no effect" do
       let(:params) {{ id: 42 }}
       example { expect(sidekiq_payload).to be == {
-        "build"    => {
-          "id"     => "#{build.id}",
-          "user_id"=> repo.owner_id,
-          "source" => "api"}
-      }}
+        "id"     => "#{build.id}",
+        "user_id"=> repo.owner_id,
+        "source" => "api"}
+      }
     end
   end