1 files changed, 4 insertions, 8 deletions

diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index f310af8..e98605e 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -29,7 +29,6 @@ class EventTest < ActiveSupport::TestCase
         :longitude    => 13.378944,
         :rrule        => "FOOBAR",
         :allday       => false,
-        :custom_rrule => false,
         :node_id      => @cal_node.id
       )
     end
@@ -44,7 +43,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => nil,
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -62,7 +60,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=WEEKLY;INTERVAL=1",
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -74,17 +71,17 @@ class EventTest < ActiveSupport::TestCase
     
     assert_equal "2009-12-24T15:23:42".to_time, scoped_occurrences[51].start_time
     assert_equal "2009-12-24T20:05:23".to_time, scoped_occurrences[51].end_time
-    assert_equal @cal_node.event, scoped_occurrences[51].event
+    assert_equal @cal_node.events.first, scoped_occurrences[51].event
     assert_equal @cal_node, scoped_occurrences[51].node
     
     assert_equal "2009-03-19T15:23:42".to_time, scoped_occurrences[11].start_time
     assert_equal "2009-03-19T20:05:23".to_time, scoped_occurrences[11].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
     
     assert_equal "2009-01-01T15:23:42".to_time, scoped_occurrences[0].start_time
     assert_equal "2009-01-01T20:05:23".to_time, scoped_occurrences[0].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
   end
   
@@ -97,7 +94,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE",
       :allday       => false,
-      :custom_rrule => true,
       :node_id      => @cal_node.id
     )
     
@@ -111,4 +107,4 @@ class EventTest < ActiveSupport::TestCase
     chaosradio_days = scoped_occurrences.map {|x| x.start_time.day}
     assert_equal expected_days, chaosradio_days
   end
-end
\ No newline at end of file
+end