active_scaffold 3.3.2 → 3.3.3

data/test/data_structures/action_columns_test.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 # require 'test/model_stub'
-require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
+#require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
 
 class ActionColumnsTest < Test::Unit::TestCase
   def setup
@@ -110,4 +110,4 @@ class ActionColumnsTest < Test::Unit::TestCase
     assert @columns.include?(:c)
     assert !@columns.include?(:d)
   end
-end
+end

data/test/data_structures/action_link_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ActionLinkTest < Test::Unit::TestCase
   def setup

data/test/data_structures/action_links_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ActionLinksTest < Test::Unit::TestCase
   def setup
@@ -53,10 +53,10 @@ class ActionLinksTest < Test::Unit::TestCase
     @links.add 'foo', :type => :collection
     @links.add 'bar', :type => :member
 
-    @links.each :collection do |link|
+    @links.collection.each do |link|
       assert_equal 'foo', link.action
     end
-    @links.each :member do |link|
+    @links.member.each do |link|
       assert_equal 'bar', link.action
     end
   end

data/test/data_structures/actions_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ActionsTest < Test::Unit::TestCase
   def setup
@@ -22,4 +22,4 @@ class ActionsTest < Test::Unit::TestCase
     @actions.add 'c'
     assert @actions.include?('c')
   end
-end
+end

data/test/data_structures/association_column_test.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-require File.join(File.dirname(__FILE__), '../model_stub')
+require 'test_helper'
+require 'model_stub'
 
 class AssociationColumnTest < Test::Unit::TestCase
   def setup
@@ -12,15 +12,14 @@ class AssociationColumnTest < Test::Unit::TestCase
   end
 
   def test_sorting
-    # sorting on association columns is method-based
-    hash = {:method => "other_model.to_s"}
-    assert_equal hash, @association_column.sort
+    # sorting on association columns is not defined
+    assert_equal false, @association_column.sort
   end
 
   def test_searching
     # by default searching on association columns uses primary key
     assert @association_column.searchable?
-    assert_equal '"model_stubs"."id"', @association_column.search_sql
+    assert_equal ['"model_stubs"."id"'], @association_column.search_sql
   end
 
   def test_association

data/test/data_structures/column_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ColumnTest < Test::Unit::TestCase
   def setup
@@ -121,9 +121,9 @@ class ColumnTest < Test::Unit::TestCase
 
   def test_custom_search
     @column.search_sql = true
-    assert_equal '"model_stubs"."a"', @column.search_sql
+    assert_equal ['"model_stubs"."a"'], @column.search_sql
     @column.search_sql = 'foobar'
-    assert_equal 'foobar', @column.search_sql
+    assert_equal ['foobar'], @column.search_sql
     assert @column.searchable?
   end
 
@@ -172,7 +172,7 @@ class ColumnTest < Test::Unit::TestCase
   end
 
   def test_includes
-    assert_equal [], @column.includes
+    assert_equal nil, @column.includes
     
     # make sure that when a non-array comes in, an array comes out
     @column.includes = :column_name
@@ -181,5 +181,9 @@ class ColumnTest < Test::Unit::TestCase
     # make sure that when a non-array comes in, an array comes out
     @column.includes = [:column_name]
     assert_equal([:column_name], @column.includes)
+
+    # make sure that when a non-array comes in, an array comes out
+    @column.includes = nil
+    assert_nil @column.includes
   end
 end

data/test/data_structures/columns_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-# require 'test/model_stub'
+require 'test_helper'
 
 class ColumnsTest < Test::Unit::TestCase
   def setup
@@ -66,4 +65,4 @@ class ColumnsTest < Test::Unit::TestCase
     assert @columns.include?(:d)
     assert @columns.include?(:c)
   end
-end
+end

data/test/data_structures/error_message_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ErrorMessageTest < Test::Unit::TestCase
   def setup
@@ -25,4 +25,4 @@ class ErrorMessageTest < Test::Unit::TestCase
     assert yml.has_key?(:error)
     assert_equal 'foo', yml[:error]
   end
-end
+end

data/test/data_structures/set_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-# require 'test/model_stub'
+require 'test_helper'
 
 class SetTest < Test::Unit::TestCase
   def setup
@@ -83,4 +82,4 @@ class SetTest < Test::Unit::TestCase
     assert @items.include?(:b)
     assert !@items.include?(:d)
   end
-end
+end

data/test/data_structures/sorting_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-# require 'test/model_stub'
+require 'test_helper'
 
 class SortingTest < Test::Unit::TestCase
   def setup

data/test/data_structures/standard_column_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-# require 'test/model_stub'
+require 'test_helper'
 
 class StandardColumnTest < Test::Unit::TestCase
   def setup
@@ -19,6 +18,6 @@ class StandardColumnTest < Test::Unit::TestCase
 
   def test_searching
     assert @standard_column.searchable?
-    assert_equal '"model_stubs"."a"', @standard_column.search_sql # check default
+    assert_equal ['"model_stubs"."a"'], @standard_column.search_sql # check default
   end
 end

data/test/data_structures/validation_reflection_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+class ValidationReflectionTest < Test::Unit::TestCase
+  def test_set_required_for_validates_presence_of
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert !column.required?
+    Company.expects(:validators_on).with(:name).returns([ActiveModel::Validations::PresenceValidator.new(:attributes => :name)])
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert column.required?
+  end
+
+  def test_set_required_for_validates_inclusion_of
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert !column.required?
+    Company.expects(:validators_on).with(:name).returns([ActiveModel::Validations::InclusionValidator.new(:attributes => :name, :in => [])])
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert column.required?
+  end
+
+  def test_not_set_required_for_validates_inclusion_of_and_allow_nil
+    Company.expects(:validators_on).with(:name).returns([ActiveModel::Validations::InclusionValidator.new(:attributes => :name, :in => [], :allow_nil => true)])
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert !column.required?
+  end
+
+  def test_not_set_required_for_validates_inclusion_of_and_allow_blank
+    Company.expects(:validators_on).with(:name).returns([ActiveModel::Validations::InclusionValidator.new(:attributes => :name, :in => [], :allow_blank => true)])
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert !column.required?
+  end
+
+  def test_not_set_required_for_no_validation
+    Company.expects(:validators_on).with(:name).returns([])
+    column = ActiveScaffold::DataStructures::Column.new(:name, Company)
+    assert !column.required?
+  end
+
+  def test_set_required_for_validates_presence_of_in_association
+    column = ActiveScaffold::DataStructures::Column.new(:main_company, Company)
+    assert !column.required?
+    Company.expects(:validators_on).with(:main_company).returns([ActiveModel::Validations::PresenceValidator.new(:attributes => :main_company)])
+    column = ActiveScaffold::DataStructures::Column.new(:main_company, Company)
+    assert column.required?
+  end
+
+  def test_not_set_required_for_no_validation_in_association_neither_foreign_key
+    Company.expects(:validators_on).returns([])
+    column = ActiveScaffold::DataStructures::Column.new(:main_company, Company)
+    assert !column.required?
+  end
+end

data/test/data_structures/virtual_column_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class VirtualColumnTest < Test::Unit::TestCase
   def setup

data/test/extensions/active_record_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-#require 'test/model_stub'
+require 'test_helper'
 
 class ActiveRecordTest < Test::Unit::TestCase
   def setup
@@ -42,4 +41,4 @@ class ActiveRecordTest < Test::Unit::TestCase
 
     assert_equal 'name', @record.to_label
   end
-end
+end

data/test/extensions/array_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ArrayTest < Test::Unit::TestCase
   def test_after
@@ -9,4 +9,4 @@ class ArrayTest < Test::Unit::TestCase
     assert_equal 'a', @sequence.after('c')
     assert_equal nil, @sequence.after('d')
   end
-end
+end

data/test/helpers/form_column_helpers_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class FormColumnHelpersTest < ActionView::TestCase
   include ActiveScaffold::Helpers::FormColumnHelpers
@@ -10,22 +10,22 @@ class FormColumnHelpersTest < ActionView::TestCase
 
   def test_choices_for_select_form_ui_for_simple_column
     @column.options[:options] = [:value_1, :value_2, :value_3]
-    assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">Value 1</option><option value="value_2">Value 2</option><option value="value_3">Value 3</option></select>', active_scaffold_input_select(@column, {})
+    assert_dom_equal "<select name=\"record[a]\" id=\"record_a\"><option value=\"value_1\">Value 1</option>\n<option value=\"value_2\">Value 2</option>\n<option value=\"value_3\">Value 3</option></select>", active_scaffold_input_select(@column, {})
 
     @column.options[:options] = %w(value_1 value_2 value_3)
-    assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">value_1</option><option value="value_2">value_2</option><option value="value_3">value_3</option></select>', active_scaffold_input_select(@column, {})
+    assert_dom_equal "<select name=\"record[a]\" id=\"record_a\"><option value=\"value_1\">value_1</option>\n<option value=\"value_2\">value_2</option>\n<option value=\"value_3\">value_3</option></select>", active_scaffold_input_select(@column, {})
 
     @column.options[:options] = [%w(text_1 value_1), %w(text_2 value_2), %w(text_3 value_3)]
-    assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">text_1</option><option value="value_2">text_2</option><option value="value_3">text_3</option></select>', active_scaffold_input_select(@column, {})
+    assert_dom_equal "<select name=\"record[a]\" id=\"record_a\"><option value=\"value_1\">text_1</option>\n<option value=\"value_2\">text_2</option>\n<option value=\"value_3\">text_3</option></select>", active_scaffold_input_select(@column, {})
 
     @column.options[:options] = [[:text_1, :value_1], [:text_2, :value_2], [:text_3, :value_3]]
-    assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">Text 1</option><option value="value_2">Text 2</option><option value="value_3">Text 3</option></select>', active_scaffold_input_select(@column, {})
+    assert_dom_equal "<select name=\"record[a]\" id=\"record_a\"><option value=\"value_1\">Text 1</option>\n<option value=\"value_2\">Text 2</option>\n<option value=\"value_3\">Text 3</option></select>", active_scaffold_input_select(@column, {})
   end
 
   def test_options_for_select_form_ui_for_simple_column
     @column.options = {:include_blank => 'None', :selected => 'value_2', :disabled => %w(value_1 value_3)}
     @column.options[:options] = %w(value_1 value_2 value_3)
     @column.options[:html_options] = {:class => 'big'}
-    assert_dom_equal '<select name="record[a]" class="big" id="record_a"><option value="">None</option><option disabled="disabled" value="value_1">value_1</option><option selected="selected" value="value_2">value_2</option><option disabled="disabled" value="value_3">value_3</option></select>', active_scaffold_input_select(@column, {})
+    assert_dom_equal "<select name=\"record[a]\" class=\"big\" id=\"record_a\"><option value=\"\">None</option>\n<option disabled=\"disabled\" value=\"value_1\">value_1</option>\n<option selected=\"selected\" value=\"value_2\">value_2</option>\n<option disabled=\"disabled\" value=\"value_3\">value_3</option></select>", active_scaffold_input_select(@column, {})
   end
 end

data/test/helpers/list_column_helpers_test.rb

@@ -1,8 +1,9 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ListColumnHelpersTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ListColumnHelpers
   include ActiveScaffold::Helpers::ViewHelpers
+  include ::ERB::Util
 
   def setup
     @column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
@@ -32,6 +33,8 @@ class ListColumnHelpersTest < ActionView::TestCase
     value.each {|v| v.stubs(:to_label).returns(v)}
     assert_equal '1, 2, 3, … (4)', format_association_value(value, @association_column, value.size)
     @config.list.stubs(:association_join_text => ',<br/>')
+    assert_equal '1,&lt;br/&gt;2,&lt;br/&gt;3,&lt;br/&gt;… (4)', format_association_value(value, @association_column, value.size)
+    @config.list.stubs(:association_join_text => ',<br/>'.html_safe)
     assert_equal '1,<br/>2,<br/>3,<br/>… (4)', format_association_value(value, @association_column, value.size)
   end
 

data/test/helpers/pagination_helpers_test.rb

@@ -1,8 +1,12 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class PaginationHelpersTest < Test::Unit::TestCase
   include ActiveScaffold::Helpers::PaginationHelpers
 
+  def active_scaffold_config
+    @config ||= config_for('model_stub')
+  end
+
   def test_links
     self.stubs(:pagination_ajax_link).returns('l')
 
@@ -50,10 +54,10 @@ class PaginationHelpersTest < Test::Unit::TestCase
   def links(current, last_page, window_size = 2, infinite = false)
     paginator = stub(:last => last_page = stub(:number => last_page), :infinite? => infinite)
     current_page = stub(:number => current, :pager => paginator)
-    pagination_ajax_links(current_page, {}, window_size)
+    pagination_ajax_links(current_page, {}, {}, window_size, 0)
   end
 
-  def content_tag(tag, text)
+  def content_tag(tag, text, *args)
     text
   end
 end

data/test/misc/active_record_permissions_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class PermissionModel < ActiveRecord::Base
   def self.columns; [] end

data/test/misc/attribute_params_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class NumberModel < ActiveRecord::Base
   abstract_class = true
@@ -9,6 +9,7 @@ end
 
 class AttributeParamsTest < Test::Unit::TestCase
   include ActiveScaffold::AttributeParams
+  include ActiveScaffold::Finder
 
   def setup
     I18n.backend.store_translations :en, :number => {:format => {
@@ -27,9 +28,7 @@ class AttributeParamsTest < Test::Unit::TestCase
     }}
 
     @config = config_for('number_model')
-    class << @config.list.columns
-      include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration
-    end
+    @config.columns[:number].form_ui = nil
     @config.list.columns.set_columns @config.columns
   end
 

data/test/misc/configurable_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 class ConfigurableClass
   FOO = 'bar'
@@ -93,4 +93,4 @@ class ConfigurableTest < Test::Unit::TestCase
     # but we want to let people accept the configurable class as the first argument, too
     assert_equal 'bar', ConfigurableClass.configure {|a| a.foo}
   end
-end
+end

data/test/misc/constraints_test.rb

@@ -1,11 +1,11 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
 module ModelStubs
   class ModelStub < ActiveRecord::Base
     abstract_class = true
     def self.columns; [ActiveRecord::ConnectionAdapters::Column.new('foo', '')] end
     def self.table_name
-      to_s.split('::').last.underscore.pluralize
+      @table_name || to_s.split('::').last.underscore.pluralize
     end
     self.store_full_sti_class = false
   end
@@ -43,31 +43,31 @@ module ModelStubs
   ##
 
   class OtherAddress < ModelStub
-    set_table_name 'addresses'
+    self.table_name = 'addresses'
     belongs_to :other_addressable, :polymorphic => true
   end
 
   class OtherUser < ModelStub
-    set_table_name 'users'
+    self.table_name = 'users'
     has_and_belongs_to_many :other_roles, :class_name => 'ModelStubs::OtherRole', :foreign_key => 'user_id', :association_foreign_key => 'role_id', :join_table => 'roles_users'
     has_one :other_subscription, :class_name => 'ModelStubs::OtherSubscription', :foreign_key => 'user_id'
     has_one :other_address, :as => :other_addressable, :class_name => 'ModelStubs::OtherAddress', :foreign_key => 'addressable_id'
   end
 
   class OtherService < ModelStub
-    set_table_name 'services'
+    self.table_name = 'services'
     has_many :other_subscriptions, :class_name => 'ModelStubs::OtherSubscription', :foreign_key => 'service_id'
     has_many :other_users, :through => :other_subscriptions # :class_name and :foreign_key are ignored for :through
   end
 
   class OtherSubscription < ModelStub
-    set_table_name 'subscriptions'
+    self.table_name = 'subscriptions'
     belongs_to :other_service, :class_name => 'ModelStubs::OtherService', :foreign_key => 'service_id'
     belongs_to :other_user, :class_name => 'ModelStubs::OtherUser', :foreign_key => 'user_id'
   end
 
   class OtherRole < ModelStub
-    set_table_name 'roles'
+    self.table_name = 'roles'
     has_and_belongs_to_many :other_users, :class_name => 'ModelStubs::OtherUser', :foreign_key => 'role_id', :association_foreign_key => 'user_id', :join_table => 'roles_users'
   end
 
@@ -112,72 +112,72 @@ class ConstraintsTest < Test::Unit::TestCase
   def test_constraint_conditions_for_default_associations
     @test_object.active_scaffold_config = config_for('user')
     # has_one (vs belongs_to)
-    assert_constraint_condition({:subscription => 5}, ['subscriptions.id = ?', 5], 'find the user with subscription #5')
+    assert_constraint_condition({:subscription => 5}, [{'subscriptions.id' => 5}], 'find the user with subscription #5')
     # habtm (vs habtm)
-    assert_constraint_condition({:roles => 4}, ['roles_users.role_id = ?', 4], 'find all users with role #4')
+    assert_constraint_condition({:roles => 4}, [{'roles_users.role_id' => 4}], 'find all users with role #4')
     # has_one (vs polymorphic)
-    assert_constraint_condition({:address => 11}, ['addresses.id = ?', 11], 'find the user with address #11')
+    assert_constraint_condition({:address => 11}, [{'addresses.id' => 11}], 'find the user with address #11')
     # reverse of a has_many :through
-    assert_constraint_condition({:subscription => {:service => 5}}, ['services.id = ?', 5], 'find all users subscribed to service #5')
+    assert_constraint_condition({:subscription => {:service => 5}}, [{'services.id' => 5}], 'find all users subscribed to service #5')
     assert(@test_object.active_scaffold_includes.include?({:subscription => :service}), 'multi-level association include')
 
     @test_object.active_scaffold_config = config_for('subscription')
     # belongs_to (vs has_one)
-    assert_constraint_condition({:user => 2}, ['subscriptions.user_id = ?', 2], 'find the subscription for user #2')
+    assert_constraint_condition({:user => 2}, [{'subscriptions.user_id' => 2}], 'find the subscription for user #2')
     # belongs_to (vs has_many)
-    assert_constraint_condition({:service => 1}, ['subscriptions.service_id = ?', 1], 'find all subscriptions for service #1')
+    assert_constraint_condition({:service => 1}, [{'subscriptions.service_id' => 1}], 'find all subscriptions for service #1')
 
     @test_object.active_scaffold_config = config_for('service')
     # has_many (vs belongs_to)
-    assert_constraint_condition({:subscriptions => 10}, ['subscriptions.id = ?', 10], 'find the service with subscription #10')
+    assert_constraint_condition({:subscriptions => 10}, [{'subscriptions.id' => 10}], 'find the service with subscription #10')
     # has_many :through (through has_many)
-    assert_constraint_condition({:users => 7}, ['users.id = ?', 7], 'find the service with user #7')
+    assert_constraint_condition({:users => 7}, [{'users.id' => 7}], 'find the service with user #7')
 
     @test_object.active_scaffold_config = config_for('address')
     # belongs_to :polymorphic => true
-    @test_object.params[:parent_model] = 'User'
-    assert_constraint_condition({:addressable => 14}, ['addresses.addressable_id = ?', 14, 'addresses.addressable_type = ?', 'User'], 'find all addresses for user #14')
+    @test_object.params[:parent_model] = 'ModelStubs::User'
+    assert_constraint_condition({:addressable => 14}, [{'addresses.addressable_id' => 14, 'addresses.addressable_type' => 'ModelStubs::User'}], 'find all addresses for user #14')
   end
 
   def test_constraint_conditions_for_configured_associations
     @test_object.active_scaffold_config = config_for('other_user')
     # has_one (vs belongs_to)
-    assert_constraint_condition({:other_subscription => 5}, ['subscriptions.id = ?', 5], 'find the user with subscription #5')
+    assert_constraint_condition({:other_subscription => 5}, [{'subscriptions.id' => 5}], 'find the user with subscription #5')
     # habtm (vs habtm)
-    assert_constraint_condition({:other_roles => 4}, ['roles_users.role_id = ?', 4], 'find all users with role #4')
+    assert_constraint_condition({:other_roles => 4}, [{'roles_users.role_id' => 4}], 'find all users with role #4')
     # has_one (vs polymorphic)
-    assert_constraint_condition({:other_address => 11}, ['addresses.id = ?', 11], 'find the user with address #11')
+    assert_constraint_condition({:other_address => 11}, [{'addresses.id' => 11}], 'find the user with address #11')
     # reverse of a has_many :through
-    assert_constraint_condition({:other_subscription => {:other_service => 5}}, ['services.id = ?', 5], 'find all users subscribed to service #5')
+    assert_constraint_condition({:other_subscription => {:other_service => 5}}, [{'services.id' => 5}], 'find all users subscribed to service #5')
 
     @test_object.active_scaffold_config = config_for('other_subscription')
     # belongs_to (vs has_one)
-    assert_constraint_condition({:other_user => 2}, ['subscriptions.user_id = ?', 2], 'find the subscription for user #2')
+    assert_constraint_condition({:other_user => 2}, [{'subscriptions.user_id' => 2}], 'find the subscription for user #2')
     # belongs_to (vs has_many)
-    assert_constraint_condition({:other_service => 1}, ['subscriptions.service_id = ?', 1], 'find all subscriptions for service #1')
+    assert_constraint_condition({:other_service => 1}, [{'subscriptions.service_id' => 1}], 'find all subscriptions for service #1')
 
     @test_object.active_scaffold_config = config_for('other_service')
     # has_many (vs belongs_to)
-    assert_constraint_condition({:other_subscriptions => 10}, ['subscriptions.id = ?', 10], 'find the service with subscription #10')
+    assert_constraint_condition({:other_subscriptions => 10}, [{'subscriptions.id' => 10}], 'find the service with subscription #10')
     # has_many :through (through has_many)
-    assert_constraint_condition({:other_users => 7}, ['users.id = ?', 7], 'find the service with user #7')
+    assert_constraint_condition({:other_users => 7}, [{'users.id' => 7}], 'find the service with user #7')
 
     @test_object.active_scaffold_config = config_for('other_address')
     # belongs_to :polymorphic => true
-    @test_object.params[:parent_model] = 'OtherUser'
-    assert_constraint_condition({:other_addressable => 14}, ['addresses.other_addressable_id = ?', 14, 'addresses.other_addressable_type = ?', 'OtherUser'], 'find all addresses for user #14')
+    @test_object.params[:parent_model] = 'ModelStubs::OtherUser'
+    assert_constraint_condition({:other_addressable => 14}, [{'addresses.other_addressable_id' => 14, 'addresses.other_addressable_type' => 'ModelStubs::OtherUser'}], 'find all addresses for user #14')
   end
 
   def test_constraint_conditions_for_normal_attributes
     @test_object.active_scaffold_config = config_for('user')
-    assert_constraint_condition({'foo' => 'bar'}, ['"users"."foo" = ?', 'bar'], 'normal column-based constraint')
+    assert_constraint_condition({'foo' => 'bar'}, [['"users"."foo" = ?', 'bar']], 'normal column-based constraint')
   end
 
   def test_constraint_conditions_for_associations_with_primary_key_option
     @test_object.active_scaffold_config = config_for('primary_key_location')
     #user = ModelStubs::PrimaryKeyUser.new(:id => 1, :name => 'User Name')
     ModelStubs::PrimaryKeyUser.expects(:find).with(1).returns(stub(:id => 1, :name => 'User Name'))
-    assert_constraint_condition({'user' => 1}, ['primary_key_locations.username = ?', 'User Name'], 'association with primary-key constraint')
+    assert_constraint_condition({'user' => 1}, [{'primary_key_locations.username' => 'User Name'}], 'association with primary-key constraint')
   end
 
   protected