From acaa63bad8119f502b067c24c362e3e97090324c Mon Sep 17 00:00:00 2001 From: Nathan Sutton Date: Sun, 18 Dec 2011 20:20:16 -0600 Subject: [PATCH] Change outputs over to the new setup --- lib/zencoder/output.rb | 3 +-- test/zencoder/output_test.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/zencoder/output.rb b/lib/zencoder/output.rb index 5b58ca9..e80b0c5 100644 --- a/lib/zencoder/output.rb +++ b/lib/zencoder/output.rb @@ -2,8 +2,7 @@ module Zencoder class Output < Resource def self.progress(output_id, options={}) - params = {:api_key => options.delete(:api_key) || api_key} - HTTP.get("#{options[:base_url] || base_url}/outputs/#{output_id}/progress", merge_params(options, params)) + get("/outputs/#{output_id}/progress", options) end end diff --git a/test/zencoder/output_test.rb b/test/zencoder/output_test.rb index 0aa9c04..89bd72e 100644 --- a/test/zencoder/output_test.rb +++ b/test/zencoder/output_test.rb @@ -14,7 +14,7 @@ class Zencoder::OutputTest < Test::Unit::TestCase end should "GET the correct url and return a response" do - Zencoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key}}).returns(Zencoder::Response.new) + Zencoder::HTTP.stubs(:get).with(@url, :headers => { "Zencoder-Api-Key" => @api_key }).returns(Zencoder::Response.new) assert_equal Zencoder::Response, Zencoder::Output.progress(@output_id, :api_key => @api_key).class end end