Merge branch 'master' into staging

Conflicts: lib/feed_handler.rb test/unit/feed_handler_test.rb

Merge branch 'master' into staging
Conflicts: lib/feed_handler.rb test/unit/feed_handler_test.rb
Victor Costa
2 parents c560f738 a1c29241
Showing 14 changed files with 167 additions and 33 deletions Show diff stats
app/models/environment.rb
app/models/external_feed.rb
app/views/features/index.html.erb
db/migrate/20160408011124_add_enable_feed_proxy_to_environments.rb
db/migrate/20160408011622_add_http_feed_proxy_to_environments.rb
db/migrate/20160408011635_add_https_feed_proxy_to_environments.rb
db/migrate/20160408011720_add_disable_feed_ssl_to_environments.rb
db/schema.rb
features/step_definitions/web_steps.rb
lib/feed_handler.rb
plugins/spaminator/Gemfile
plugins/spaminator/lib/spaminator_plugin/spaminator.rb
test/unit/environment_test.rb
test/unit/feed_handler_test.rb
@@ -13,7 +13,9 @@ class Environment &lt; ActiveRecord::Base
                   :reports_lower_bound, :noreply_email,
                   :signup_welcome_screen_body, :members_whitelist_enabled,
                   :members_whitelist, :highlighted_news_amount,
-                  :portal_news_amount, :date_format, :signup_intro
+                  :portal_news_amount, :date_format, :signup_intro,
+                  :enable_feed_proxy, :http_feed_proxy, :https_feed_proxy,
+                  :disable_feed_ssl
   has_many :users
@@ -12,6 +12,8 @@ class ExternalFeed &lt; ActiveRecord::Base
   attr_accessible :address, :enabled, :only_once
+  delegate :environment, :to => :blog, :allow_nil => true
+
   def add_item(title, link, date, content)
     return if content.blank?
     doc = Nokogiri::HTML.fragment content
@@ -49,6 +49,25 @@ Check all the features you want to enable for your environment, uncheck all the 
   </div>
 <hr/>
+<h3><%= _('Feed') %></h3>
+  <div class="option">
+    <%= check_box :environment, :enable_feed_proxy %>
+    <label><%= _('Enable feed proxy') %></label>
+  </div>
+  <div class="input">
+    <div class="info"><%= _('HTTP feed proxy address:') %></div>
+    <%= text_field :environment, :http_feed_proxy %>
+  </div>
+  <div class="input">
+    <div class="info"><%= _('HTTPS feed proxy address:') %></div>
+    <%= text_field :environment, :https_feed_proxy %>
+  </div>
+  <div class="option">
+    <%= check_box :environment, :disable_feed_ssl %>
+    <label><%= _('Disable feed SSL') %></label>
+  </div>
+<hr/>
+
 <div>
   <% button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
@@ -0,0 +1,5 @@
+class AddEnableFeedProxyToEnvironments < ActiveRecord::Migration
+  def change
+    add_column :environments, :enable_feed_proxy, :boolean, default: false
+  end
+end
@@ -0,0 +1,5 @@
+class AddHttpFeedProxyToEnvironments < ActiveRecord::Migration
+  def change
+    add_column :environments, :http_feed_proxy, :string
+  end
+end
@@ -0,0 +1,5 @@
+class AddHttpsFeedProxyToEnvironments < ActiveRecord::Migration
+  def change
+    add_column :environments, :https_feed_proxy, :string
+  end
+end
@@ -0,0 +1,5 @@
+class AddDisableFeedSslToEnvironments < ActiveRecord::Migration
+  def change
+    add_column :environments, :disable_feed_ssl, :boolean, default: false
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160324132518) do
+ActiveRecord::Schema.define(version: 20160408011720) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -391,6 +391,10 @@ ActiveRecord::Schema.define(version: 20160324132518) do
     t.string   "noreply_email"
     t.string   "redirection_after_signup",     default: "keep_on_same_page"
     t.string   "date_format",                  default: "month_name_with_year"
+    t.boolean  "enable_feed_proxy",            default: false
+    t.string   "http_feed_proxy"
+    t.string   "https_feed_proxy"
+    t.boolean  "disable_feed_ssl",             default: false
   end
   create_table "external_feeds", force: :cascade do |t|
@@ -204,7 +204,7 @@ Then /^the &quot;([^&quot;]*)&quot; field(?: within &quot;([^&quot;]*)&quot;)? should not contain &quot;([^&quot;]*)&quot;$/ 
   end
 end
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
+Then /^the "([^"]*)" (?:checkbox|radio button)(?: within "([^"]*)")? should be checked$/ do |label, selector|
   with_scope(selector) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
@@ -215,7 +215,7 @@ Then /^the &quot;([^&quot;]*)&quot; checkbox(?: within &quot;([^&quot;]*)&quot;)? should be checked$/ do |labe
   end
 end
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
+Then /^the "([^"]*)" (?:checkbox|radio button)(?: within "([^"]*)")? should not be checked$/ do |label, selector|
   with_scope(selector) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
@@ -31,7 +31,7 @@ class FeedHandler
     end
   end
-  def fetch(address)
+  def fetch(address, header = {})
     begin
       content = ""
       block = lambda { |s| content = s.read }
@@ -42,13 +42,7 @@ class FeedHandler
           if !valid_url?(address)
             raise InvalidUrl.new("\"%s\" is not a valid URL" % address)
           end
-          header = {"User-Agent" => "Noosfero/#{Noosfero::VERSION}"}
-          if address.starts_with?("https://")
-            header.merge!(:proxy => ENV['FEED_HTTPS_PROXY']) if ENV['FEED_HTTPS_PROXY']
-          else
-            header.merge!(:proxy => ENV['FEED_HTTP_PROXY']) if ENV['FEED_HTTP_PROXY']
-          end
-          header.merge!(:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE) if ENV['SSL_VERIFY_NONE']
+          header.merge!("User-Agent" => "Noosfero/#{Noosfero::VERSION}")
           open(address, header, &block)
         end
       return content
@@ -57,6 +51,17 @@ class FeedHandler
     end
   end
+  def fetch_through_proxy(address, environment)
+    header = {}
+    if address.starts_with?("https://")
+      header.merge!(:proxy => environment.https_feed_proxy) if environment.https_feed_proxy
+    else
+      header.merge!(:proxy => environment.http_feed_proxy) if environment.http_feed_proxy
+    end
+    header.merge!(:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE) if environment.disable_feed_ssl
+    fetch(address, header)
+  end
+
   def process(container)
     begin
       container.class.transaction do
@@ -97,7 +102,11 @@ class FeedHandler
   def actually_process_container(container)
     container.clear
-    content = fetch(container.address)
+    if container.environment.enable_feed_proxy
+      content = fetch_through_proxy(container.address, container.environment)
+    else
+      content = fetch(container.address)
+    end
     container.fetched_at = Time.now
     parsed_feed = parse(content)
     container.feed_title = parsed_feed.title
-gem "progressbar"
+gem "ruby-progressbar"
@@ -72,14 +72,14 @@ class SpaminatorPlugin::Spaminator
     self.class.log("Starting to process all comments")
     comments = comments_to_process
     total = comments.count
-    pbar = ProgressBar.new("☢ Comments", total) if Rails.env.development?
+    pbar = ProgressBar.create(title: "☢ Comments", total: total, format: '%t: |%B| %E') if Rails.env.development?
     comments.each do |comment|
       begin
         process_comment(comment)
       rescue
         register_fail(:comments, comment)
       end
-      pbar.inc if Rails.env.development?
+      pbar.increment if Rails.env.development?
     end
     @report.processed_comments = total
     pbar.finish if Rails.env.development?
@@ -90,11 +90,11 @@ class SpaminatorPlugin::Spaminator
     self.class.log("Starting to process all people")
     people = people_to_process
     total = people.count
-    pbar = ProgressBar.new("☢ People", total) if Rails.env.development?
+    pbar = ProgressBar.create(title: "☢ People", total: total, format: '%t: |%B| %E') if Rails.env.development?
     people.find_each do |person|
       process_person_by_comments(person)
       process_person_by_no_network(person)
-      pbar.inc if Rails.env.development?
+      pbar.increment if Rails.env.development?
     end
     @report.processed_people = total
     pbar.finish if Rails.env.development?
@@ -1723,4 +1723,42 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     refute environment.errors[:date_format.to_s].present?
   end
+  should 'respond to enable_feed_proxy' do
+    assert_respond_to Environment.new, :enable_feed_proxy
+  end
+
+  should 'set enable_feed_proxy on environment' do
+    e = fast_create(Environment, :name => 'Enterprise test')
+    e.enable_feed_proxy = true
+    e.save
+    assert_equal true, e.enable_feed_proxy
+  end
+
+  should 'not enable feed proxy when enable by default' do
+    assert_equal false, Environment.new.enable_feed_proxy
+  end
+
+  should 'respond to disable_feed_ssl' do
+    assert_respond_to Environment.new, :disable_feed_ssl
+  end
+
+  should 'set disable_feed_ssl on environment' do
+    e = fast_create(Environment, :name => 'Enterprise test')
+    e.disable_feed_ssl = true
+    e.save
+    assert_equal true, e.disable_feed_ssl
+  end
+
+  should 'not disable feed ssl when enable by default' do
+    assert_equal false, Environment.new.disable_feed_ssl
+  end
+
+  should 'respond to http_feed_proxy' do
+    assert_respond_to Environment.new, :http_feed_proxy
+  end
+
+  should 'respond to https_feed_proxy' do
+    assert_respond_to Environment.new, :https_feed_proxy
+  end
+
 end
@@ -12,7 +12,7 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
     @container ||= create(:feed_reader_block)
   end
-  should 'fetch feed content' do
+  should 'fetch feed content with proxy disabled and SSL enabled' do
     content = handler.fetch(container.address)
     assert_match /<description>Feed content<\/description>/, content
     assert_match /<title>Feed for unit tests<\/title>/, content
@@ -28,6 +28,7 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
   end
   should 'process feed and populate container' do
+    container.stubs(:environment).returns(Environment.new)
     handler.process(container)
     assert_equal 'Feed for unit tests', container.feed_title
     assert_equivalent ["First POST", "Second POST", "Last POST"], container.feed_items.map {|item| item[:title]}
@@ -62,6 +63,7 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
   end
   should 'save only latest N posts from feed' do
+    container.stubs(:environment).returns(Environment.new)
     container.limit = 1
     handler.process(container)
     assert_equal 1, container.feed_items.size
@@ -85,6 +87,7 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
   should 'identifies itself as noosfero user agent' do
     handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}"}, anything).returns('bli content')
+
     assert_equal 'bli content', handler.fetch('http://site.org/feed.xml')
   end
@@ -150,36 +153,73 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'set proxy when FEED_HTTP_PROXY is setted from env' do
-    ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128')
+  should 'set proxy when http_feed_proxy is setted from env' do
+    env = Environment.new
+    env.expects(:disable_feed_ssl).returns(false)
+    env.expects(:http_feed_proxy).twice.returns('http://127.0.0.1:3128')
+
     handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content')
-    assert_equal 'bli content', handler.fetch('http://site.org/feed.xml')
+
+    assert_equal 'bli content', handler.fetch_through_proxy('http://site.org/feed.xml', env)
   end
-  should 'set proxy when FEED_HTTPS_PROXY is setted from env' do
-    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.1:3128')
+  should 'set proxy when https_feed_proxy is setted from env' do
+    env = Environment.new
+    env.expects(:disable_feed_ssl).returns(false)
+    env.expects(:https_feed_proxy).twice.returns('http://127.0.0.1:3128')
+
     handler.expects(:open).with('https://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content')
-    assert_equal 'bli content', handler.fetch('https://site.org/feed.xml')
+
+    assert_equal 'bli content', handler.fetch_through_proxy('https://site.org/feed.xml', env)
   end
   should 'use https proxy for https address when both env variables were defined' do
-    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.2:3128')
-    ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128')
+    env = Environment.new
+    env.expects(:disable_feed_ssl).returns(false)
+    env.expects(:https_feed_proxy).twice.returns('http://127.0.0.2:3128')
+
     handler.expects(:open).with('https://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.2:3128'}, anything).returns('bli content')
-    assert_equal 'bli content', handler.fetch('https://site.org/feed.xml')
+
+    assert_equal 'bli content', handler.fetch_through_proxy('https://site.org/feed.xml', env)
   end
   should 'use http proxy for http address when both env variables were defined' do
-    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.2:3128')
-    ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128')
+    env = Environment.new
+    env.expects(:disable_feed_ssl).returns(false)
+    env.expects(:http_feed_proxy).twice.returns('http://127.0.0.1:3128')
+
     handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content')
-    assert_equal 'bli content', handler.fetch('http://site.org/feed.xml')
+
+    assert_equal 'bli content', handler.fetch_through_proxy('http://site.org/feed.xml', env)
   end
   should 'not verify ssl when define env parameter SSL_VERIFY_NONE' do
-    ENV.stubs('[]').with('SSL_VERIFY_NONE').returns(true)
+    env = Environment.new
+    env.expects(:disable_feed_ssl).returns(true)
+
     handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE}, anything)
-    handler.fetch('http://site.org/feed.xml')
+
+    handler.fetch_through_proxy('http://site.org/feed.xml', env)
+  end
+
+  [:external_feed, :feed_reader_block].each do |container_class|
+    should "not use proxy settings for #{container_class} from one environment on another" do
+      one = create(:environment)
+      one.expects(:enable_feed_proxy).returns(true)
+      container_one = create(container_class)
+      container_one.stubs(:environment).returns(one)
+
+      handler.expects(:fetch_through_proxy).with(container_one.address, one)
+      handler.process(container_one)
+
+      another = create(:environment)
+      another.expects(:enable_feed_proxy).returns(false)
+      container_another = create(container_class)
+      container_another.stubs(:environment).returns(another)
+
+      handler.expects(:fetch_through_proxy).never.with(container_another.address, another)
+      handler.process(container_another)
+    end
   end
 end
	@@ -12,6 +12,8 @@ class ExternalFeed < ActiveRecord::Base		@@ -12,6 +12,8 @@ class ExternalFeed < ActiveRecord::Base
12		12
13	attr_accessible :address, :enabled, :only_once	13	attr_accessible :address, :enabled, :only_once
14		14
		15	+ delegate :environment, :to => :blog, :allow_nil => true
		16	+
15	def add_item(title, link, date, content)	17	def add_item(title, link, date, content)
16	return if content.blank?	18	return if content.blank?
17	doc = Nokogiri::HTML.fragment content	19	doc = Nokogiri::HTML.fragment content
	@@ -49,6 +49,25 @@ Check all the features you want to enable for your environment, uncheck all the		@@ -49,6 +49,25 @@ Check all the features you want to enable for your environment, uncheck all the
49	</div>	49	</div>
50	<hr/>	50	<hr/>
51		51
		52	+<h3><%= _('Feed') %></h3>
		53	+ <div class="option">
		54	+ <%= check_box :environment, :enable_feed_proxy %>
		55	+ <label><%= _('Enable feed proxy') %></label>
		56	+ </div>
		57	+ <div class="input">
		58	+ <div class="info"><%= _('HTTP feed proxy address:') %></div>
		59	+ <%= text_field :environment, :http_feed_proxy %>
		60	+ </div>
		61	+ <div class="input">
		62	+ <div class="info"><%= _('HTTPS feed proxy address:') %></div>
		63	+ <%= text_field :environment, :https_feed_proxy %>
		64	+ </div>
		65	+ <div class="option">
		66	+ <%= check_box :environment, :disable_feed_ssl %>
		67	+ <label><%= _('Disable feed SSL') %></label>
		68	+ </div>
		69	+<hr/>
		70	+
52	<div>	71	<div>
53	<% button_bar do %>	72	<% button_bar do %>
54	<%= submit_button('save', _('Save changes')) %>	73	<%= submit_button('save', _('Save changes')) %>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddEnableFeedProxyToEnvironments < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :environments, :enable_feed_proxy, :boolean, default: false
	4	+ end
	5	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddHttpFeedProxyToEnvironments < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :environments, :http_feed_proxy, :string
	4	+ end
	5	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddHttpsFeedProxyToEnvironments < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :environments, :https_feed_proxy, :string
	4	+ end
	5	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddDisableFeedSslToEnvironments < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :environments, :disable_feed_ssl, :boolean, default: false
	4	+ end
	5	+end
	@@ -204,7 +204,7 @@ Then /^the "([^"])" field(?: within "([^"])")? should not contain "([^"]*)"$/		@@ -204,7 +204,7 @@ Then /^the "([^"])" field(?: within "([^"])")? should not contain "([^"]*)"$/
204	end	204	end
205	end	205	end
206		206
207	-Then /^the "([^"])" checkbox(?: within "([^"])")? should be checked$/ do \|label, selector\|	207	+Then /^the "([^"])" (?:checkbox\|radio button)(?: within "([^"])")? should be checked$/ do \|label, selector\|
208	with_scope(selector) do	208	with_scope(selector) do
209	field_checked = find_field(label)['checked']	209	field_checked = find_field(label)['checked']
210	if field_checked.respond_to? :should	210	if field_checked.respond_to? :should
	@@ -215,7 +215,7 @@ Then /^the "([^"])" checkbox(?: within "([^"])")? should be checked$/ do \|labe		@@ -215,7 +215,7 @@ Then /^the "([^"])" checkbox(?: within "([^"])")? should be checked$/ do \|labe
215	end	215	end
216	end	216	end
217		217
218	-Then /^the "([^"])" checkbox(?: within "([^"])")? should not be checked$/ do \|label, selector\|	218	+Then /^the "([^"])" (?:checkbox\|radio button)(?: within "([^"])")? should not be checked$/ do \|label, selector\|
219	with_scope(selector) do	219	with_scope(selector) do
220	field_checked = find_field(label)['checked']	220	field_checked = find_field(label)['checked']
221	if field_checked.respond_to? :should	221	if field_checked.respond_to? :should
	@@ -72,14 +72,14 @@ class SpaminatorPlugin::Spaminator		@@ -72,14 +72,14 @@ class SpaminatorPlugin::Spaminator
72	self.class.log("Starting to process all comments")	72	self.class.log("Starting to process all comments")
73	comments = comments_to_process	73	comments = comments_to_process
74	total = comments.count	74	total = comments.count
75	- pbar = ProgressBar.new("☢ Comments", total) if Rails.env.development?	75	+ pbar = ProgressBar.create(title: "☢ Comments", total: total, format: '%t: \|%B\| %E') if Rails.env.development?
76	comments.each do \|comment\|	76	comments.each do \|comment\|
77	begin	77	begin
78	process_comment(comment)	78	process_comment(comment)
79	rescue	79	rescue
80	register_fail(:comments, comment)	80	register_fail(:comments, comment)
81	end	81	end
82	- pbar.inc if Rails.env.development?	82	+ pbar.increment if Rails.env.development?
83	end	83	end
84	@report.processed_comments = total	84	@report.processed_comments = total
85	pbar.finish if Rails.env.development?	85	pbar.finish if Rails.env.development?
	@@ -90,11 +90,11 @@ class SpaminatorPlugin::Spaminator		@@ -90,11 +90,11 @@ class SpaminatorPlugin::Spaminator
90	self.class.log("Starting to process all people")	90	self.class.log("Starting to process all people")
91	people = people_to_process	91	people = people_to_process
92	total = people.count	92	total = people.count
93	- pbar = ProgressBar.new("☢ People", total) if Rails.env.development?	93	+ pbar = ProgressBar.create(title: "☢ People", total: total, format: '%t: \|%B\| %E') if Rails.env.development?
94	people.find_each do \|person\|	94	people.find_each do \|person\|
95	process_person_by_comments(person)	95	process_person_by_comments(person)
96	process_person_by_no_network(person)	96	process_person_by_no_network(person)
97	- pbar.inc if Rails.env.development?	97	+ pbar.increment if Rails.env.development?
98	end	98	end
99	@report.processed_people = total	99	@report.processed_people = total
100	pbar.finish if Rails.env.development?	100	pbar.finish if Rails.env.development?
	@@ -1723,4 +1723,42 @@ class EnvironmentTest < ActiveSupport::TestCase		@@ -1723,4 +1723,42 @@ class EnvironmentTest < ActiveSupport::TestCase
1723	refute environment.errors[:date_format.to_s].present?	1723	refute environment.errors[:date_format.to_s].present?
1724	end	1724	end
1725		1725
		1726	+ should 'respond to enable_feed_proxy' do
		1727	+ assert_respond_to Environment.new, :enable_feed_proxy
		1728	+ end
		1729	+
		1730	+ should 'set enable_feed_proxy on environment' do
		1731	+ e = fast_create(Environment, :name => 'Enterprise test')
		1732	+ e.enable_feed_proxy = true
		1733	+ e.save
		1734	+ assert_equal true, e.enable_feed_proxy
		1735	+ end
		1736	+
		1737	+ should 'not enable feed proxy when enable by default' do
		1738	+ assert_equal false, Environment.new.enable_feed_proxy
		1739	+ end
		1740	+
		1741	+ should 'respond to disable_feed_ssl' do
		1742	+ assert_respond_to Environment.new, :disable_feed_ssl
		1743	+ end
		1744	+
		1745	+ should 'set disable_feed_ssl on environment' do
		1746	+ e = fast_create(Environment, :name => 'Enterprise test')
		1747	+ e.disable_feed_ssl = true
		1748	+ e.save
		1749	+ assert_equal true, e.disable_feed_ssl
		1750	+ end
		1751	+
		1752	+ should 'not disable feed ssl when enable by default' do
		1753	+ assert_equal false, Environment.new.disable_feed_ssl
		1754	+ end
		1755	+
		1756	+ should 'respond to http_feed_proxy' do
		1757	+ assert_respond_to Environment.new, :http_feed_proxy
		1758	+ end
		1759	+
		1760	+ should 'respond to https_feed_proxy' do
		1761	+ assert_respond_to Environment.new, :https_feed_proxy
		1762	+ end
		1763	+
1726	end	1764	end