comparison test/functional/.svn/text-base/calendars_controller_test.rb.svn-base @ 41:7f0e922c8982 luisf

merged with new version from trunk

   def test_cross_project_calendar
     get :show
     assert_response :success
     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