diff test/functional/queries_controller_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/test/functional/queries_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/queries_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 require 'queries_controller'
 
 # Re-raise errors caught by the controller.
@@ -64,9 +64,9 @@
          :project_id => 'ecookbook', 
          :confirm => '1',
          :default_columns => '1',
-         :fields => ["status_id", "assigned_to_id"],
-         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
-         :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
+         :f => ["status_id", "assigned_to_id"],
+         :op => {"assigned_to_id" => "=", "status_id" => "o"},
+         :v => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
          :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
          
     q = Query.find_by_name('test_new_project_public_query')
@@ -101,7 +101,8 @@
          :fields => ["status_id", "assigned_to_id"],
          :operators => {"assigned_to_id" => "=", "status_id" => "o"},
          :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
-         :query => {"name" => "test_new_global_private_query", "is_public" => "1", "column_names" => ["", "tracker", "subject", "priority", "category"]}
+         :query => {"name" => "test_new_global_private_query", "is_public" => "1"},
+         :c => ["", "tracker", "subject", "priority", "category"]
          
     q = Query.find_by_name('test_new_global_private_query')
     assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q