diff test/functional/calendars_controller_test.rb @ 51:371eac10df0b live

* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.

--- a/test/functional/calendars_controller_test.rb	Thu Oct 21 11:19:14 2010 +0100
+++ b/test/functional/calendars_controller_test.rb	Wed Nov 24 12:20:08 2010 +0000
@@ -16,6 +16,16 @@
     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