Mercurial > hg > soundsoftware-site

diff test/functional/calendars_controller_test.rb @ 524:1248a47e81b3 feature_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents 0c939c159af4
children cbb26bc654de
line wrap: on
line diff
--- a/test/functional/calendars_controller_test.rb	Fri Jul 15 17:21:05 2011 +0100
+++ b/test/functional/calendars_controller_test.rb	Mon Jul 25 14:39:38 2011 +0100
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class CalendarsControllerTest < ActionController::TestCase
   fixtures :all
@@ -19,7 +19,7 @@
 
   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