meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Merged r4245 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4317 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-10-31 23:55:19 +00:00
parent 05432cfc3d
commit a63c92388f
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/calendars_controller.rb
View File

@ -8,6 +8,8 @@ class CalendarsController < ApplicationController
helper :projects helper :projects
helper :queries helper :queries
include QueriesHelper include QueriesHelper
helper :sort
include SortHelper
def show def show
if params[:year] and params[:year].to_i > 1900 if params[:year] and params[:year].to_i > 1900

10
test/functional/calendars_controller_test.rb
View File

@ -17,6 +17,16 @@ class CalendarsControllerTest < ActionController::TestCase
assert_not_nil assigns(:calendar) assert_not_nil assigns(:calendar)
end 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 def test_week_number_calculation
Setting.start_of_week = 7 Setting.start_of_week = 7