From d8e24bf52fa47a0488dc5c7cda0f63e61c74c493 Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 30 Sep 2015 16:37:34 +0200 Subject: [PATCH] v3 fix specs for build canceland restart --- lib/travis/api/v3/queries/build.rb | 3 +-- spec/v3/services/build/cancel_spec.rb | 2 +- spec/v3/services/build/restart_spec.rb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/travis/api/v3/queries/build.rb b/lib/travis/api/v3/queries/build.rb index ac37edb8..540837d7 100644 --- a/lib/travis/api/v3/queries/build.rb +++ b/lib/travis/api/v3/queries/build.rb @@ -7,9 +7,8 @@ module Travis::API::V3 raise WrongParams, 'missing build.id'.freeze end - # TODO this must match restart method below def cancel(user) - payload = {id: id, user_id: user.id, source: 'api'} + payload = { id: id, user_id: user.id, source: 'api' } perform_async(:build_cancellation, payload) payload end diff --git a/spec/v3/services/build/cancel_spec.rb b/spec/v3/services/build/cancel_spec.rb index db32e36a..6940d4a2 100644 --- a/spec/v3/services/build/cancel_spec.rb +++ b/spec/v3/services/build/cancel_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Travis::API::V3::Services::Build::Cancel do let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first } let(:build) { repo.builds.first } - let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last[:payload]) } + let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last.to_json) } let(:sidekiq_params) { Sidekiq::Client.last['args'].last.deep_symbolize_keys } before do diff --git a/spec/v3/services/build/restart_spec.rb b/spec/v3/services/build/restart_spec.rb index 14ba5ce3..40e7ba5d 100644 --- a/spec/v3/services/build/restart_spec.rb +++ b/spec/v3/services/build/restart_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Travis::API::V3::Services::Build::Restart do let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first } let(:build) { repo.builds.first } - let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last[:payload]) } + let(:sidekiq_payload) { JSON.load(Sidekiq::Client.last['args'].last.to_json) } let(:sidekiq_params) { Sidekiq::Client.last['args'].last.deep_symbolize_keys } before do