diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/controllers/events_controller_test.rb | 3 | ||||
| -rw-r--r-- | test/models/event_test.rb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb index 9371ca7..46f3f4f 100644 --- a/test/controllers/events_controller_test.rb +++ b/test/controllers/events_controller_test.rb | |||
| @@ -4,6 +4,9 @@ class EventsControllerTest < ActionController::TestCase | |||
| 4 | 4 | ||
| 5 | test "should get index" do | 5 | test "should get index" do |
| 6 | login_as :quentin | 6 | login_as :quentin |
| 7 | node = create_node_with_published_page | ||
| 8 | Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour) | ||
| 9 | |||
| 7 | get :index | 10 | get :index |
| 8 | assert_response :success | 11 | assert_response :success |
| 9 | assert_not_nil assigns(:events) | 12 | assert_not_nil assigns(:events) |
diff --git a/test/models/event_test.rb b/test/models/event_test.rb index d85aadd..e98605e 100644 --- a/test/models/event_test.rb +++ b/test/models/event_test.rb | |||
| @@ -29,7 +29,6 @@ class EventTest < ActiveSupport::TestCase | |||
| 29 | :longitude => 13.378944, | 29 | :longitude => 13.378944, |
| 30 | :rrule => "FOOBAR", | 30 | :rrule => "FOOBAR", |
| 31 | :allday => false, | 31 | :allday => false, |
| 32 | :custom_rrule => false, | ||
| 33 | :node_id => @cal_node.id | 32 | :node_id => @cal_node.id |
| 34 | ) | 33 | ) |
| 35 | end | 34 | end |
| @@ -44,7 +43,6 @@ class EventTest < ActiveSupport::TestCase | |||
| 44 | :longitude => 13.378944, | 43 | :longitude => 13.378944, |
| 45 | :rrule => nil, | 44 | :rrule => nil, |
| 46 | :allday => false, | 45 | :allday => false, |
| 47 | :custom_rrule => false, | ||
| 48 | :node_id => @cal_node.id | 46 | :node_id => @cal_node.id |
| 49 | ) | 47 | ) |
| 50 | 48 | ||
| @@ -62,7 +60,6 @@ class EventTest < ActiveSupport::TestCase | |||
| 62 | :longitude => 13.378944, | 60 | :longitude => 13.378944, |
| 63 | :rrule => "FREQ=WEEKLY;INTERVAL=1", | 61 | :rrule => "FREQ=WEEKLY;INTERVAL=1", |
| 64 | :allday => false, | 62 | :allday => false, |
| 65 | :custom_rrule => false, | ||
| 66 | :node_id => @cal_node.id | 63 | :node_id => @cal_node.id |
| 67 | ) | 64 | ) |
| 68 | 65 | ||
| @@ -97,7 +94,6 @@ class EventTest < ActiveSupport::TestCase | |||
| 97 | :longitude => 13.378944, | 94 | :longitude => 13.378944, |
| 98 | :rrule => "FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE", | 95 | :rrule => "FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE", |
| 99 | :allday => false, | 96 | :allday => false, |
| 100 | :custom_rrule => true, | ||
| 101 | :node_id => @cal_node.id | 97 | :node_id => @cal_node.id |
| 102 | ) | 98 | ) |
| 103 | 99 | ||
