From e26c07e75bd996ab27673aac67914c423204e7cf Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Wed, 30 Nov 2016 01:24:36 +0900 Subject: [PATCH] Fix a merge conflict --- spec/models/agents/rss_agent_spec.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/spec/models/agents/rss_agent_spec.rb b/spec/models/agents/rss_agent_spec.rb index ac651166..399cf819 100644 --- a/spec/models/agents/rss_agent_spec.rb +++ b/spec/models/agents/rss_agent_spec.rb @@ -12,11 +12,8 @@ describe Agents::RssAgent do stub_request(:any, /SlickdealsnetFP/).to_return(:body => File.read(Rails.root.join("spec/data_fixtures/slickdeals.atom")), :status => 200) stub_request(:any, /onethingwell.org/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/onethingwell.rss")), status: 200) stub_request(:any, /bad.onethingwell.org/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/onethingwell.rss")).gsub(/(?<=)[^<]*/, ''), status: 200) -<<<<<<< HEAD stub_request(:any, /iso-8859-1/).to_return(body: File.binread(Rails.root.join("spec/data_fixtures/iso-8859-1.rss")), headers: { 'Content-Type' => 'application/rss+xml; charset=ISO-8859-1' }, status: 200) -======= stub_request(:any, /podcast/).to_return(body: File.read(Rails.root.join("spec/data_fixtures/podcast.rss")), status: 200) ->>>>>>> Add podcast tags to events emitted by RssAgent end let(:agent) do