Updated a test for no direction with empty feeds as rss, changed some private keyword...

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 0339706833e51ea93d659faabaa5a7fe04d74a85..41e357a13bb90e0ff7ca0d0cc11f7f240b5a60b6 100644 (file)
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -58,10 +58,10 @@ class FeedController < ApplicationController
   end
   
 
   end
   
 

-  private
+  # private

 
 
 
 

-  def create_item
+  private def create_item

     item = FeedItem.new(:feed_name => params[:feed_name],
       :title => params[:title],
       :description => params[:description])
     item = FeedItem.new(:feed_name => params[:feed_name],
       :title => params[:title],
       :description => params[:description])


@@ -80,7 +80,7 @@ class FeedController < ApplicationController
   end
 
 
   end
 
 

-  def update_item(item)
+  private def update_item(item)

     if item.update_attribute(:description, params[:description])
       flash[:notice] = "Element #{params[:title]} updated"
       respond_to do |format|
     if item.update_attribute(:description, params[:description])
       flash[:notice] = "Element #{params[:title]} updated"
       respond_to do |format|


@@ -97,7 +97,7 @@ class FeedController < ApplicationController
   end
 
 
   end
 
 

-  def destroy_item(item)
+  private def destroy_item(item)

     if item.destroy
       flash[:notice] = "Element #{params[:title]} deleted"
       respond_to do |format|
     if item.destroy
       flash[:notice] = "Element #{params[:title]} deleted"
       respond_to do |format|

diff --git a/spec/controllers/feed_controller_spec.rb b/spec/controllers/feed_controller_spec.rb
index 8c065036f09830786c002b5f6027c1a752b94c57..c2b71a4459b823059b755b88659183c8c35406a4 100644 (file)
--- a/spec/controllers/feed_controller_spec.rb
+++ b/spec/controllers/feed_controller_spec.rb
@@ -28,10 +28,15 @@ describe FeedController do
     let!(:feed_item2) { FactoryGirl.create(:feed_item, 
       feed_name: "test_feed", title: "item 2") }
     
     let!(:feed_item2) { FactoryGirl.create(:feed_item, 
       feed_name: "test_feed", title: "item 2") }
     

-    it "redirects an emtpy feed to the index" do
+    it "redirects an emtpy html feed to the index" do

       get :show, feed_name: "empty_feed"
       expect(response).to redirect_to(index_path)
     end 
       get :show, feed_name: "empty_feed"
       expect(response).to redirect_to(index_path)
     end 

+
+    it "returns an emtpy rss document for an empty feed" do
+      get :show, feed_name: "empty_feed", format: "rss"
+      expect(response.status).to be(200)
+    end 

     
     it "responds successfully with an HTTP 200 status code" do
       get :show, feed_name: "test_feed"
     
     it "responds successfully with an HTTP 200 status code" do
       get :show, feed_name: "test_feed"