Fix bug in RSS feed. [#64]

marnen · Dec 29, 2011 · 950bdd4 · 950bdd4
1 parent ab4be5e
commit 950bdd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -63,9 +63,9 @@ def show
   def feed
     respond_to do |format|
       format.rss do
-        @events = current_objects
-        @key = params[:key]
         params[:from_date] = Date.civil(1, 1, 1)
+        @key = params[:key]
+        @events = current_objects
       end
     end
   end

diff --git a/spec/controllers/events_controller_spec.rb b/spec/controllers/events_controller_spec.rb
@@ -59,10 +59,10 @@
     user = FactoryGirl.create :user
     User.stub!(:current_user).and_return(user) # we need this for some of the callbacks on Calendar and Event
     @calendar = FactoryGirl.create :calendar
+    Factory :permission, user: user, calendar: @calendar, role: Factory(:role)
     @one = FactoryGirl.create :event, :name => 'Event 1', :calendar => @calendar, :date => Date.civil(2008, 7, 4), :description => 'The first event.', :created_at => 1.week.ago
     @two = FactoryGirl.create :event, :name => 'Event 2', :calendar => @calendar, :date => Date.civil(2008, 10, 10), :description => 'The <i>second</i> event.', :created_at => 2.days.ago
     @events = [@one, @two]
-    controller.stub!(:current_objects).and_return(@events)
     get :feed, :format => 'rss', :key => user.single_access_token
   end