Commit 9aa7b2bd authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert
Browse files

bump ruby-oembed

parent d62f3c86

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ gem "nokogiri", "1.6.7.1" 
gem "redcarpet",         "3.3.3"

gem "twitter-text",      "1.13.0"

gem "roxml",             "3.1.6"

gem "ruby-oembed",       "0.8.14"

gem "ruby-oembed",       "0.9.0"

gem "open_graph_reader", "0.6.1"



# Services

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ GEM 
      rainbow (>= 1.99.1, < 3.0)

      ruby-progressbar (~> 1.7)

      tins (<= 1.6.0)

    ruby-oembed (0.8.14)

    ruby-oembed (0.9.0)

    ruby-progressbar (1.7.5)

    rubyzip (1.1.7)

    safe_yaml (1.0.4)
@@ -876,7 +876,7 @@ DEPENDENCIES 
  rspec-instafail (= 0.4.0)

  rspec-rails (= 3.3.3)

  rubocop (= 0.35.1)

  ruby-oembed (= 0.8.14)

  ruby-oembed (= 0.9.0)

  rubyzip (= 1.1.7)

  sass-rails (= 5.0.4)

  selenium-webdriver (= 2.47.1)

spec/controllers/jasmine_fixtures/aspects_spec.rb

+1 −1
Original line number Diff line number Diff line
@@ -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&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"

          "https://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(