Don't show talks that are scheduled >= 28 days out

seattlerb · Mar 6, 2013 · b7d89a4 · b7d89a4
1 parent 32b340e
commit b7d89a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/models/talk.rb b/app/models/talk.rb
@@ -11,7 +11,11 @@ class Talk < ActiveRecord::Base
                              presenter,
                              title"
 
-  scope :available, by_kind.where(:completed => false)
+  def self.available
+    by_kind.where("completed = ? and (scheduled_date is NULL or scheduled_date < ?)",
+                  false,
+                  28.days.from_now)
+  end
 
   validates(:kind,
             :inclusion => {

diff --git a/test/controllers/talks_controller_test.rb b/test/controllers/talks_controller_test.rb
@@ -60,13 +60,13 @@ def test_talks_sorted_on_scheduled_date_kind_and_title
     setup_talks
 
     @beg_two.scheduled_date = 2.month.from_now
-    @int_two.scheduled_date = 1.months.from_now
+    @int_two.scheduled_date = 27.days.from_now
     @beg_two.save
     @int_two.save
 
     get :index
 
-    expected = [@int_two, @beg_two,
+    expected = [@int_two,
                 @beg_one, @talk,
                 @int_one,
                 @adv_one, @adv_two,