@@ -1,6 +1,16 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' + +# Suppress file lists when running tests +Rake::TestTask.class_eval do + alias_method :original_define, :define + def define + @verbose = false + original_define + end +end + require 'test/lib/ar_helper' load 'test/lib/multi_rails/tasks/multi_rails.rake' load 'tasks/rcov.rake' Rakefile @@ -37,6 +37,10 @@ class Streamlined::Column::ActiveRecord < Streamlined::Column::Base def render_td_show(view, item) if enumeration content = item.send(self.name) + if enumeration.first.is_a?(Array) + key_value_pair = enumeration.detect { |e| e.last == content } + content = key_value_pair.first if key_value_pair + end content = content && !content.blank? ? content : self.unassigned_value content = wrap_with_link(content, view, item) else @@ -44,6 +48,11 @@ class Streamlined::Column::ActiveRecord < Streamlined::Column::Base end end + def enumeration + # Convert the enumeration to a 2d array if it's a hash + @enumeration.is_a?(Hash) ? @enumeration.to_a : @enumeration + end + def render_td_list(view, item) id = relationship_div_id(name, item) div = render_td_show(view, item) lib/streamlined/column/active_record.rb @@ -136,7 +136,7 @@ describe "Streamlined::Column::ActiveRecord" do assert_equal "Unassigned", @ar.render_td_show(@view, item) end - it "render td with enumeration" do + it "render td with array-backed enumeration" do setup_mocks @ar.enumeration = %w{ A B C } @view.should_receive(:crud_context).and_return(:list).once @@ -144,6 +144,38 @@ describe "Streamlined::Column::ActiveRecord" do assert_equal expected, @ar.render_td(@view, @item) end + it "render td with hash-backed enumeration" do + setup_mocks(:column => 1) + @ar.enumeration = { "A" => 1, "B" => 2, "C" => 3 } + @view.should_receive(:crud_context).and_return(:list).once + expected = "<div id=\"EnumerableSelect::column::123::\">A</div>link" + assert_equal expected, @ar.render_td(@view, @item) + end + + it "render td with hash-backed enumeration and nil column value" do + setup_mocks(:column => nil) + @ar.enumeration = { "A" => 1, "B" => 2, "C" => 3 } + @view.should_receive(:crud_context).and_return(:list).once + expected = "<div id=\"EnumerableSelect::column::123::\">Unassigned</div>link" + assert_equal expected, @ar.render_td(@view, @item) + end + + it "render td with 2d array-backed enumeration" do + setup_mocks(:column => 1) + @ar.enumeration = [["A", 1], ["B", 2], ["C", 3]] + @view.should_receive(:crud_context).and_return(:list).once + expected = "<div id=\"EnumerableSelect::column::123::\">A</div>link" + assert_equal expected, @ar.render_td(@view, @item) + end + + it "render td with 2d array-backed enumeration and nil column value" do + setup_mocks(:column => nil) + @ar.enumeration = [["A", 1], ["B", 2], ["C", 3]] + @view.should_receive(:crud_context).and_return(:list).once + expected = "<div id=\"EnumerableSelect::column::123::\">Unassigned</div>link" + assert_equal expected, @ar.render_td(@view, @item) + end + it "render td list with enumeration and link" do setup_mocks @ar.enumeration = %w{ A B C } @@ -223,8 +255,8 @@ private flexmock(:name => name, :human_name => human_name) end - def setup_mocks + def setup_mocks(item_attrs={}) @view = flexmock(:controller_name => 'controller_name', :link_to_function => 'link') - @item = flexmock(:id => 123, :column => 'render') + @item = flexmock(item_attrs.reverse_merge(:id => 123, :column => 'render')) end end test/unit/streamlined/column/active_record_test.rb 4865d87f75e5ce2b830d47a57f3ca66d88b822f7 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab http://github.com/relevance/streamlined/commit/4311503142969d0a69774ffe7f45682e077def52 4311503142969d0a69774ffe7f45682e077def52 2008-03-16T20:06:03-07:00 2008-03-16T20:06:03-07:00 #140 fixed hash-backed enumerations so the correct value is displayed in the show/list views f8d5ec0c18f7c7ce1468e08bc919ea74d6b4873e matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab