diff options
| -rw-r--r-- | app/controllers/calendars_controller.rb | 2 | ||||
| -rw-r--r-- | test/functional/calendars_controller_test.rb | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index febacd075..4544b3399 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -8,6 +8,8 @@ class CalendarsController < ApplicationController helper :projects helper :queries include QueriesHelper + helper :sort + include SortHelper def show if params[:year] and params[:year].to_i > 1900 diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index ad047c669..3fb9ad1f0 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -16,6 +16,16 @@ class CalendarsControllerTest < ActionController::TestCase assert_template 'calendar' assert_not_nil assigns(:calendar) end + + context "GET :show" do + should "run custom queries" do + @query = Query.generate_default! + + get :show, :query_id => @query.id + assert_response :success + end + + end def test_week_number_calculation Setting.start_of_week = 7 |