Changeset 694
- Timestamp:
- 01/10/08 10:20:57 (7 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/rails2/app/helpers/admin/node_helper.rb
r589 r694 14 14 unless @expanded_rows 15 15 @expanded_rows = case 16 when row _string = (cookies['expanded_rows'] || []).first17 row _string.split(',').map { |x| Integer(x) rescue nil }.compact16 when rows = cookies['expanded_rows'] 17 rows.split(',').map { |x| Integer(x) rescue nil }.compact 18 18 else 19 19 [] branches/rails2/test/functional/admin/page_controller_test.rb
r689 r694 45 45 46 46 def test_index__with_empty_cookie 47 @request.cookies['expanded_rows'] = [""] 48 get :index 49 assert_response :success 47 write_cookie('expanded_rows', '') 48 get :index 49 assert_response :success 50 assert '', cookies['expanded_rows'] 50 51 assert_rendered_nodes_where { |page| [nil, 1].include?(page.parent_id) } 51 52 end 52 53 53 54 def test_index__with_cookie 54 @request.cookies['expanded_rows'] = ["1,5,9,10,11,12,52"] 55 get :index 56 assert_response :success 55 write_cookie('expanded_rows', '1,5,9,10,11,12,52') 56 get :index 57 assert_response :success 58 assert '1,5,9,10,11,12,52', cookies['expanded_rows'] 57 59 assert_rendered_nodes_where { |page| [nil, 1, 5, 9, 52, 10, 11, 12].include?(page.parent_id) } 58 60 end 59 61 60 62 def test_index__with_mangled_cookie 61 @request.cookies['expanded_rows'] = ["1,5,:#*)&},9a,,,"] 62 get :index 63 assert_response :success 63 write_cookie('expanded_rows', '1,5,:#*)&},9a,,,') 64 get :index 65 assert_response :success 66 assert '1,5,:#*)&},9a,,,', cookies['expanded_rows'] 64 67 assert_rendered_nodes_where { |page| [nil, 1, 5].include?(page.parent_id) } 65 68 assert !assigns(:homepage).nil? … … 299 302 end 300 303 end 304 305 def write_cookie(name, value) 306 @request.cookies[name] = CGI::Cookie.new(name, value) 307 end 301 308 end
