comparison test/functional/calendars_controller_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class CalendarsControllerTest < ActionController::TestCase
   fixtures :all
 
   def test_calendar

     assert_not_nil assigns(:calendar)
   end
 
   context "GET :show" do
     should "run custom queries" do
-      @query = Query.generate_default!
+      @query = Query.generate_default!(:is_public => true)
       
       get :show, :query_id => @query.id
       assert_response :success
     end