diff --git a/config/initializers/oembed.rb b/config/initializers/oembed.rb index bf0fc20925b68b35b2d5a38e59f30e634f1e5a42..e8334cdad083957d2eb56d68ce394ba64c0ad04c 100644 --- a/config/initializers/oembed.rb +++ b/config/initializers/oembed.rb @@ -15,8 +15,6 @@ oembed_provider_list = [ OEmbed::Providers::Flickr ] -OEmbed::Providers::Youtube.endpoint += "?scheme=https" - oembed_providers = YAML.load_file(Rails.root.join("config", "oembed_providers.yml")) oembed_providers.each do |provider_name, provider| diff --git a/spec/controllers/jasmine_fixtures/aspects_spec.rb b/spec/controllers/jasmine_fixtures/aspects_spec.rb index 315d4605746c9ff891f14e8be804754b570cb5f1..bdbf026baef8ea68148840e1af91d3f5fba33a0c 100644 --- a/spec/controllers/jasmine_fixtures/aspects_spec.rb +++ b/spec/controllers/jasmine_fixtures/aspects_spec.rb @@ -68,7 +68,7 @@ describe StreamsController, :type => :controller do it "generates a jasmine fixture with a post containing a video", :fixture => true do stub_request( :get, - "http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https?scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A" + "http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A" ).with( :headers => {'Accept'=>'*/*'} ).to_return(