browsercms_s3 3.0.3

data/test/unit/extensions/integer_test.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class IntegerTest < ActiveSupport::TestCase
+  def test_round_bytes
+    assert_equal "99.44 MB", (99.megabytes + 450.kilobytes).round_bytes
+    assert_equal "12.04 KB", (12.kilobytes + 45).round_bytes
+    assert_equal "999 bytes", 999.round_bytes
+    assert_equal "0 bytes", nil.round_bytes
+  end
+end

data/test/unit/helpers/application_helper_test.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class Cms::ApplicationHelperTest < ActionView::TestCase
+  
+  def test_url_with_mode
+    [
+      [["http://localhost:3000", "edit"], "?mode=edit"],
+      [["http://localhost:3000/", "edit"], "/?mode=edit"],
+      [["http://localhost:3000/foo", "edit"], "/foo?mode=edit"],
+      [["http://localhost:3000/foo?bar=1", "edit"], "/foo?bar=1&mode=edit"],
+      [["http://localhost:3000/foo?mode=view", "edit"], "/foo?mode=edit"],
+      [["http://localhost:3000/foo?bar=1&mode=view", "edit"], "/foo?bar=1&mode=edit"],
+      [["http://localhost:3000/foo?other_mode=1&mode=view", "edit"], "/foo?other_mode=1&mode=edit"],
+      [["/foo?other_mode=1&mode=view", "edit"], "/foo?other_mode=1&mode=edit"]
+    ].each do |args, expected|
+      assert_equal expected, url_with_mode(*args)
+    end
+  end
+  
+  def test_determine_order
+    assert_equal "foo", determine_order("foo desc", "foo desc")
+    assert_equal "foo", determine_order("foo desc", "foo")
+    assert_equal "foo desc", determine_order("foo", "foo desc")
+    assert_equal "foo desc", determine_order("foo", "foo")
+    assert_equal "bar desc", determine_order("foo", "bar desc")
+    assert_equal "bar", determine_order("foo", "bar")
+  end
+  
+end

data/test/unit/helpers/form_builder_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+class FormBuilderTest < ActionView::TestCase
+
+  def setup
+
+  end
+
+  def teardown
+
+  end
+
+
+  test "Text field includes instructions" do
+    
+  end
+end

data/test/unit/helpers/menu_helper_test.rb

@@ -0,0 +1,217 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class Cms::MenuHelperTest < ActionView::TestCase
+  
+  def test_menu_items
+    Page.first.update_attributes(:hidden => true, :publish_on_save => true)
+    create_nfl_data
+
+    expected = [
+      { :id => "section_#{@afc.id}", :url => "/buf", :name => "AFC", :children => [
+          { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+          { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North", :children => [
+              { :id => "page_#{@bal.id}", :selected => true, :url => "/bal", :name => "Baltimore Ravens" },
+              { :id => "page_#{@cin.id}", :url => "/cin", :name => "Cincinnati Bengals" },
+              { :id => "page_#{@cle.id}", :url => "/cle", :name => "Cleveland Browns" },
+              { :id => "page_#{@pit.id}", :url => "/pit", :name => "Pittsburgh Steelers" }
+            ] },
+          { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" },
+          { :id => "section_#{@afc_west.id}", :url => "/den", :name => "West" }
+        ] },
+      { :id => "section_#{@nfc.id}", :url => "/dal", :name => "NFC" }
+    ]
+    
+    assert_equal expected, menu_items(:page => @bal)
+
+    @page = @bal
+    assert_equal expected, menu_items
+    
+    expected = [
+      { :id => "section_#{@afc.id}", :url => "/buf", :name => "AFC", :children => [
+          { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+          { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North" },
+          { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" },
+          { :id => "section_#{@afc_west.id}", :url => "/den", :name => "West" }
+        ] },
+      { :id => "section_#{@nfc.id}", :url => "/dal", :name => "NFC" }
+    ]
+    
+    assert_equal expected, menu_items(:depth => 2)
+    
+    expected = [
+      { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+      { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North", :children => [
+          { :id => "page_#{@bal.id}", :selected => true, :url => "/bal", :name => "Baltimore Ravens" },
+          { :id => "page_#{@cin.id}", :url => "/cin", :name => "Cincinnati Bengals" },
+          { :id => "page_#{@cle.id}", :url => "/cle", :name => "Cleveland Browns" },
+          { :id => "page_#{@pit.id}", :url => "/pit", :name => "Pittsburgh Steelers" }
+        ] },
+      { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" },
+      { :id => "section_#{@afc_west.id}", :url => "/den", :name => "West" }
+    ]
+    
+    assert_equal expected, menu_items(:from_top => 1, :depth => 2)
+    
+    expected = [
+      { :id => "section_#{@afc.id}", :url => "/buf", :name => "AFC", :children => [
+          { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+          { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North" },
+          { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" },
+          { :id => "section_#{@afc_west.id}", :url => "/den", :name => "West" }
+        ] },
+      { :id => "section_#{@nfc.id}", :url => "/dal", :name => "NFC", :children => [
+          { :id => "section_#{@nfc_east.id}", :url => "/dal", :name => "East" },
+          { :id => "section_#{@nfc_north.id}", :url => "/chi", :name => "North" },
+          { :id => "section_#{@nfc_south.id}", :url => "/atl", :name => "South" },
+          { :id => "section_#{@nfc_west.id}", :url => "/ari", :name => "West" }
+        ] }
+    ]
+    
+    assert_equal expected, menu_items(:depth => 2, :show_all_siblings => true)
+    
+    expected = [
+      { :id => "section_#{@afc.id}", :url => "/buf", :name => "AFC" },
+      { :id => "section_#{@nfc.id}", :url => "/dal", :name => "NFC" }
+    ]
+    
+    assert_equal expected, menu_items(:depth => 1)
+    
+    expected = [
+      { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+      { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North" },
+      { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" },
+      { :id => "section_#{@afc_west.id}", :url => "/den", :name => "West" }
+    ]
+    
+    assert_equal expected, menu_items(:from_top => 1, :depth => 1)
+    
+    expected = [
+      { :id => "section_#{@afc_east.id}", :url => "/buf", :name => "East" },
+      { :id => "section_#{@afc_north.id}", :url => "/bal", :name => "North" },
+      { :id => "section_#{@afc_south.id}", :url => "/hou", :name => "South" }
+    ]
+    
+    assert_equal expected, menu_items(:from_top => 1, :depth => 1, :limit => 3)
+    
+  end
+  
+  def test_menu_with_links
+    Page.first.update_attributes(:hidden => true, :publish_on_save => true)
+    
+    @news = Factory(:section, :parent => root_section, :name => "News", :path => "/whatever")
+    @press_releases = Factory(:page, :section => @news, :name => "Press Releases", :path => "/press_releases", :publish_on_save => true)
+    @corporate_news = Factory(:link, :section => @news, :name => "Corporate News", :url => "/news", :new_window => false, :publish_on_save => true)
+    @cnn = Factory(:link, :section => @news, :name => "CNN", :url => "http://www.cnn.com", :new_window => true, :publish_on_save => true)
+    
+    expected = [
+      { :id => "section_#{@news.id}", :url => "/press_releases", :name => "News", :children => [
+          { :id => "page_#{@press_releases.id}", :selected => true, :url => "/press_releases", :name => "Press Releases" },
+          { :id => "link_#{@corporate_news.id}", :url => "/news", :name => "Corporate News" },
+          { :id => "link_#{@cnn.id}", :url => "http://www.cnn.com", :target => "_blank", :name => "CNN" }
+        ] }
+    ]
+    
+    @page = @press_releases
+    assert_equal expected, menu_items
+    assert_equal [], menu_items(:from_top => 42)
+  end
+
+  def test_render_menu_does_not_show_unpublished_pages
+    @section = Factory(:section, :name => "Test", :path => "/test")
+    @page = Factory(:page, :section => @section, :name => "Overview", :path => "/test", :publish_on_save => true)
+
+    @draft_page = Factory(:page, :section => @section, :name => "Draft v1", :path => "/draft", :publish_on_save => true)
+    @draft_page.update_attributes(:name => "Draft v2")    
+    @never_published = Factory(:page, :section => @section, :name => "Never Published", :path => "/never_published")
+    
+    expected = [
+      { :id => "page_#{@page.id}", :name => "Overview", :url => "/test", :selected => true },
+      { :id => "page_#{@draft_page.id}", :name => "Draft v1", :url => "/draft" }
+    ]
+    
+    assert_equal expected, menu_items(:from_top => 1)
+  end
+  
+  def test_render_menu_with_path
+    @test = Factory(:page, :section => root_section, :name => "Test", :path => "/test", :publish_on_save => true)
+    @footer = Factory(:section, :parent => root_section, :name => "Footer", :path => "/footer")
+    @about_us = Factory(:page, :section => @footer, :name => "About Us", :path => "/about_us", :publish_on_save => true)
+    @contact_us = Factory(:page, :section => @footer, :name => "Contact Us", :path => "/contact_us", :publish_on_save => true)
+    @privacy_policy = Factory(:page, :section => @footer, :name => "Privacy Policy", :path => "/privacy_policy", :publish_on_save => true)
+    
+    expected = [
+      { :id => "page_#{@about_us.id}", :url => "/about_us", :name => "About Us" },
+      { :id => "page_#{@contact_us.id}", :url => "/contact_us", :name => "Contact Us" },
+      { :id => "page_#{@privacy_policy.id}", :url => "/privacy_policy", :name => "Privacy Policy" }
+    ]
+    
+    actual = menu_items(:page => @test, :path => "/footer", :from_top => 1)
+    assert_equal expected, actual
+
+    expected = [
+      { :id => "page_#{@about_us.id}", :url => "/about_us", :name => "About Us" },
+      { :id => "page_#{@contact_us.id}", :url => "/contact_us", :name => "Contact Us", :selected => true },
+      { :id => "page_#{@privacy_policy.id}", :url => "/privacy_policy", :name => "Privacy Policy" }
+    ]
+    
+    actual = menu_items(:page => @contact_us, :path => "/footer", :from_top => 1)
+    assert_equal expected, actual
+  end
+  
+  protected
+    def create_nfl_data
+      @afc = Factory(:section, :parent => root_section, :name => "AFC")
+
+      @afc_east = Factory(:section, :parent => @afc, :name => "East")
+      @buf = Factory(:page, :section => @afc_east, :name => "Buffalo Bills", :path => "/buf", :publish_on_save => true)
+      @mia = Factory(:page, :section => @afc_east, :name => "Miami Dolphins", :path => "/mia", :publish_on_save => true)
+      @ne = Factory(:page, :section => @afc_east, :name => "New England Patriots", :path => "/ne", :publish_on_save => true)
+      @nyj = Factory(:page, :section => @afc_east, :name => "New York Jets", :path => "/nyj", :publish_on_save => true)
+
+      @afc_north = Factory(:section, :parent => @afc, :name => "North")
+      @bal = Factory(:page, :section => @afc_north, :name => "Baltimore Ravens", :path => "/bal", :publish_on_save => true)
+      @cin = Factory(:page, :section => @afc_north, :name => "Cincinnati Bengals", :path => "/cin", :publish_on_save => true)
+      @cle = Factory(:page, :section => @afc_north, :name => "Cleveland Browns", :path => "/cle", :publish_on_save => true)
+      @pit = Factory(:page, :section => @afc_north, :name => "Pittsburgh Steelers", :path => "/pit", :publish_on_save => true)
+
+      @afc_south = Factory(:section, :parent => @afc, :name => "South")
+      @hou = Factory(:page, :section => @afc_south, :name => "Houston Texans", :path => "/hou", :publish_on_save => true)
+      @ind = Factory(:page, :section => @afc_south, :name => "Indianapolis Colts", :path => "/ind", :publish_on_save => true)
+      @jac = Factory(:page, :section => @afc_south, :name => "Jacksonville Jaguars", :path => "/jac", :publish_on_save => true)
+      @ten = Factory(:page, :section => @afc_south, :name => "Tennessee Titans", :path => "/ten", :publish_on_save => true)
+
+      @afc_west = Factory(:section, :parent => @afc, :name => "West")
+      @den = Factory(:page, :section => @afc_west, :name => "Denver Broncos", :path => "/den", :publish_on_save => true)
+      @kc = Factory(:page, :section => @afc_west, :name => "Kansas City Chiefs", :path => "/kc", :publish_on_save => true)
+      @oak = Factory(:page, :section => @afc_west, :name => "Oakland Raiders", :path => "/oak", :publish_on_save => true)
+      @sd = Factory(:page, :section => @afc_west, :name => "San Diego Chargers", :path => "/sd", :publish_on_save => true)
+
+      @nfc = Factory(:section, :parent => root_section, :name => "NFC")
+
+      @nfc_east = Factory(:section, :parent => @nfc, :name => "East")
+      @dal = Factory(:page, :section => @nfc_east, :name => "Dallas Cowboys", :path => "/dal", :publish_on_save => true)
+      @nyg = Factory(:page, :section => @nfc_east, :name => "New York Giants", :path => "/nyg", :publish_on_save => true)
+      @phi = Factory(:page, :section => @nfc_east, :name => "Philadelphia Eagles", :path => "/phi", :publish_on_save => true)
+      @was = Factory(:page, :section => @nfc_east, :name => "Washington Redskins", :path => "/was", :publish_on_save => true)
+
+      @nfc_north = Factory(:section, :parent => @nfc, :name => "North")
+      @chi = Factory(:page, :section => @nfc_north, :name => "Chicago Bears", :path => "/chi", :publish_on_save => true)
+      @det = Factory(:page, :section => @nfc_north, :name => "Detroit Lions", :path => "/det", :publish_on_save => true)
+      @gb = Factory(:page, :section => @nfc_north, :name => "Green Bay Packers", :path => "/gb", :publish_on_save => true)
+      @min = Factory(:page, :section => @nfc_north, :name => "Minnesota Vikings", :path => "/min", :publish_on_save => true)
+
+      @nfc_south = Factory(:section, :parent => @nfc, :name => "South")
+      @atl = Factory(:page, :section => @nfc_south, :name => "Atlanta Falcons", :path => "/atl", :publish_on_save => true)
+      @car = Factory(:page, :section => @nfc_south, :name => "Carolina Pathers", :path => "/car", :publish_on_save => true)
+      @no = Factory(:page, :section => @nfc_south, :name => "New Orleans Saints", :path => "/no", :publish_on_save => true)
+      @tb = Factory(:page, :section => @nfc_south, :name => "Tampa Bay Buccaneers", :path => "/tb", :publish_on_save => true)
+
+      @nfc_west = Factory(:section, :parent => @nfc, :name => "West")
+      @ari = Factory(:page, :section => @nfc_west, :name => "Arizona Cardinals", :path => "/ari", :publish_on_save => true)
+      @sf = Factory(:page, :section => @nfc_west, :name => "San Francisco 49ers", :path => "/sf", :publish_on_save => true)
+      @sea = Factory(:page, :section => @nfc_west, :name => "Seattle Seahawks", :path => "/sea", :publish_on_save => true)
+      @stl = Factory(:page, :section => @nfc_west, :name => "St. Louis Rams", :path => "/stl", :publish_on_save => true)
+
+    end
+  
+end

data/test/unit/helpers/page_helper_test.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class Cms::PageHelperTest < ActionView::TestCase
+  
+  def test_render_breadcrumbs
+    @foo = Factory(:section, :name => "Foo", :parent => root_section, :path => "/foo")
+    Factory(:page, :name => "Overview", :section => @foo, :path => "/foo")
+    @bar = Factory(:section, :name => "Bar", :parent => @foo, :path => "/bar")
+    @overview = Factory(:page, :name => "Overview", :section => @bar, :path => "/bar")
+    @bang = Factory(:page, :name => "Bang", :section => @bar, :path => "/bar/bang")
+
+    @page = @bang
+    
+    expected = <<HTML
+<ul class="breadcrumbs">
+  <li class="first"><a href="/">My Site</a></li>
+  <li><a href="/foo">Foo</a></li>
+  <li><a href="/bar">Bar</a></li>
+  <li>Bang</li>
+</ul>
+HTML
+    
+    assert_equal expected.chomp, render_breadcrumbs
+    
+    expected = <<HTML
+<ul class="breadcrumbs">
+  <li class="first"><a href="/foo">Foo</a></li>
+  <li><a href="/bar">Bar</a></li>
+  <li>Bang</li>
+</ul>
+HTML
+
+    assert_equal expected.chomp, render_breadcrumbs(:from_top => 1)
+
+    @page = @overview
+
+    expected = <<HTML
+<ul class="breadcrumbs">
+  <li class="first"><a href="/foo">Foo</a></li>
+  <li>Bar</li>
+</ul>
+HTML
+    
+    assert_equal expected.chomp, render_breadcrumbs(:from_top => 1)
+
+    expected = <<HTML
+<ul class="breadcrumbs">
+  <li class="first"><a href="/foo">Foo</a></li>
+  <li><a href="/bar">Bar</a></li>
+  <li>Overview</li>
+</ul>
+HTML
+    
+    assert_equal expected.chomp, render_breadcrumbs(:from_top => 1, :show_parent => true)
+  end  
+  
+end

data/test/unit/helpers/path_helper_test.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class Cms::PathHelperTest < ActionView::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+
+  def test_edit_cms_connectable_path_for_html
+    block = HtmlBlock.create!(:name=>"Testing")
+    path = edit_cms_connectable_path(block)
+
+    assert_equal "/cms/html_blocks/#{block.id}/edit", path
+  end
+
+
+  def test_edit_cms_connectable_path_for_portlets
+    portlet = DynamicPortlet.create(:name => "Testing Route generation")
+    path = edit_cms_connectable_path(portlet)
+
+    assert_equal( edit_cms_portlet_path(portlet), path )
+  end
+
+  def test_edit_cms_connectable_path_includes_options_for_html
+    block = HtmlBlock.create!(:name=>"Testing")
+    path = edit_cms_connectable_path(block, :_redirect_to => "some_path")
+
+    assert_equal "/cms/html_blocks/#{block.id}/edit?_redirect_to=some_path", path
+
+  end
+
+  def test_edit_cms_connectable_path_includes_options_for_portlets
+    portlet = DynamicPortlet.create(:name => "Testing Route generation")
+    path = edit_cms_connectable_path(portlet, :_redirect_to => "/some_path")
+
+    assert_equal( edit_cms_portlet_path(portlet, :_redirect_to => "/some_path"), path )
+  end
+
+
+  #
+  #   This is a test to confirm in my head how polymorphic path building works in rails.
+  #   It also confirms that it still works as expected in the future, as these don't seem
+  #   like common methods to be used, and may be subject to breakage.
+  #
+  def test_how_rails_path_building_works
+    block = HtmlBlock.create!(:name=>"Name")
+    assert_equal "/cms/html_blocks/#{block.id}/edit", url_for([:edit, :cms, block])
+    assert_equal "/cms/html_blocks/#{block.id}/edit", polymorphic_path([:edit, :cms, block])
+    assert_equal "/cms/html_blocks/#{block.id}/edit?redirect_to=go_here", polymorphic_path([:edit, :cms, block], :redirect_to=>"go_here")
+  end
+
+
+
+
+end

data/test/unit/lib/content_block_test.rb

@@ -0,0 +1,166 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class ContentBlockTest < ActiveSupport::TestCase
+  def setup
+    @block = Factory(:html_block, :name => "Test")   
+  end
+  
+  def test_publishing
+    assert_equal "Draft", @block.status_name
+    assert !@block.published?
+
+    @block.publish
+
+    assert @block.published?
+
+    @block.publish_on_save = true
+    @block.save
+    
+    assert @block.published?
+
+    assert @block.update_attributes(:name => "Whatever")
+    
+    assert !@block.live?
+    
+  end
+
+  def test_revision_comment_on_create
+    assert_equal 'Created', @block.draft.version_comment
+  end
+
+  def test_revision_comment_on_update
+    assert @block.update_attributes(:name => "Something Else", :content => "Whatever")
+    assert_equal 'Changed content, name', @block.draft.version_comment
+  end
+
+  def test_revision_comment_without_changes
+    assert @block.update_attributes(:name => @block.name)
+    assert_equal 'Created', @block.draft.version_comment
+  end
+
+  def test_custom_revision_comment
+    assert @block.update_attributes(:name => "Something Else", :version_comment => "Something Changed")
+    assert_equal "Something Changed", @block.draft.version_comment
+  end
+  
+  def test_destroy
+    html_block_count = HtmlBlock.count
+    assert_equal 1, @block.versions.size
+    assert !@block.deleted?
+    
+    @block.destroy
+
+    assert !HtmlBlock.exists?(@block.id)
+    assert !HtmlBlock.exists?(["name = ?", @block.name])
+    assert_decremented html_block_count, HtmlBlock.count
+    assert_raise(ActiveRecord::RecordNotFound) { HtmlBlock.find(@b) }
+    assert_nil HtmlBlock.find_by_name(@block.name)
+
+    deleted_block = HtmlBlock.find_with_deleted(@block.id)
+    assert_equal 2, deleted_block.versions.size
+    assert_equal 2, deleted_block.version
+    assert_equal 1, deleted_block.versions.first.version
+    assert_equal 2, HtmlBlock::Version.count(:conditions => {:html_block_id => @block.id})
+  end  
+  
+  def test_delete_all
+    HtmlBlock.delete_all(["name = ?", @block.name])
+    assert_raise(ActiveRecord::RecordNotFound) { HtmlBlock.find(@block.id) }
+    assert HtmlBlock.find_with_deleted(@block.id).deleted?
+  end
+  
+end
+
+class VersionedContentBlockConnectedToAPageTest < ActiveSupport::TestCase
+  def setup
+    @page = Factory(:page, :section => root_section)
+    @block = Factory(:html_block, :name => "Versioned Content Block")
+    @page.create_connector(@block, "main")
+    reset(:page, :block)    
+  end  
+  
+  def test_editing_connected_to_an_unpublished_page
+    page_version_count = Page::Version.count
+    assert !@page.published?
+    
+    assert @block.update_attributes(:name => "something different")
+    reset(:page)
+    
+    assert !@page.published?
+    assert_equal 3, @page.draft.version
+    assert_incremented page_version_count, Page::Version.count
+    assert_match /^HtmlBlock #\d+ was Edited/, @page.draft.version_comment
+
+    conns = @block.connectors.all(:order => 'id')
+    assert_equal 2, conns.size
+    assert_properties conns[0], :page => @page, :page_version => 2, :connectable => @block, :connectable_version => 1, :container => "main"
+    assert_properties conns[1], :page => @page, :page_version => 3, :connectable => @block, :connectable_version => 2, :container => "main"
+  end
+  
+  def test_editing_connected_to_a_published_page
+    @page.publish!
+    reset(:page, :block)
+    
+    assert @page.published?
+    assert @block.update_attributes(:name => "something different", :publish_on_save => true)
+    reset(:page)
+    
+    assert @page.published?
+  end  
+  
+  def test_deleting_when_connected_to_page
+    @page.publish!
+    reset(:page, :block)
+
+    page_connector_count = @page.connectors.for_page_version(@page.draft.version).count
+    page_version = @page.draft.version
+
+    @block.destroy
+
+    reset(:page)
+
+    assert_decremented page_connector_count, @page.connectors.for_page_version(@page.draft.version).count
+    assert_incremented page_version, @page.draft.version
+    assert_match /^HtmlBlock #\d+ was Deleted/, @page.draft.version_comment
+  end  
+  
+end
+
+class NonVersionedContentBlockConnectedToAPageTest < ActiveSupport::TestCase
+  def setup
+    @page = Factory(:page, :section => root_section)
+    @block = DynamicPortlet.create!(:name => "Non-Versioned Content Block")
+    @page.create_connector(@block, "main")
+    reset(:page, :block)    
+  end
+
+  def test_editing_connected_to_an_unpublished_page
+    page_version_count = Page::Version.count
+
+    assert_equal "Dynamic Portlet 'Non-Versioned Content Block' was added to the 'main' container",
+      @page.draft.version_comment
+    assert !@page.published?
+
+    assert @block.update_attributes(:name => "something different", :publish_on_save => true)
+    reset(:page)
+    
+    assert 2, @page.version
+    assert_equal page_version_count, Page::Version.count
+    assert !@page.published?
+    
+    conns = Connector.for_connectable(@block).all(:order => 'id')
+    assert_equal 1, conns.size
+    assert_properties conns[0], :page => @page, :page_version => 2, :connectable => @block, :connectable_version => nil, :container => "main"
+  end
+    
+  def test_editing_connected_to_a_published_page
+    @page.publish!
+    reset(:page)
+    
+    assert @page.published?
+    assert @block.update_attributes(:name => "something different", :publish_on_save => true)
+    reset(:page)
+    
+    assert @page.published?
+  end  
+end

data/test/unit/lib/generators_test.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class GeneratorsTest < Test::Unit::TestCase
+
+  def test_patterns_substition_for_windows
+    pattern = /\b[A-Za-z]:\//
+
+    # Default
+    full_windows_path = "C:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", Cms.scrub_path(full_windows_path)
+
+    # D: drive
+    full_windows_path = "D:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", Cms.scrub_path(full_windows_path)
+
+    # F: Drive
+    full_windows_path = "F:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", Cms.scrub_path(full_windows_path)
+
+    # lower-case
+    full_windows_path = "c:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js", Cms.scrub_path(full_windows_path)
+
+    # multiple
+    full_windows_path = "c:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js c:/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/custom.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js /Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/custom.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/jquery-ui.js /Ruby/lib/ruby/gems/1.8/gems/browsercms-3.0.0/public/javascripts/custom.js", Cms.scrub_path(full_windows_path)
+
+    # not scrub if in middle of string
+    full_windows_path = "c:/Ruby/lib/ruby/gems/1.8/gems:local/browsercms-3.0.0/public/javascripts/jquery-ui.js"
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems:local/browsercms-3.0.0/public/javascripts/jquery-ui.js", full_windows_path.gsub(pattern, "/")
+    assert_equal "/Ruby/lib/ruby/gems/1.8/gems:local/browsercms-3.0.0/public/javascripts/jquery-ui.js", Cms.scrub_path(full_windows_path)
+
+  end
+ 
+end

data/test/unit/lib/routes_test.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+
+class RouteBuilder
+  include Cms::Routes
+end
+
+class Bear < ActiveRecord::Base
+  acts_as_content_block
+end
+
+class Kindness < ActiveRecord::Base
+  acts_as_content_block
+end
+
+class RoutesTest < ActiveSupport::TestCase
+
+  test "Verify behavior of classify, and how it works with already pluralized symbols" do
+    assert_equal "Kindness", :kindnesses.to_s.classify, "routes will pass 'plural' symbols to 'content_block', rather than single"    
+  end
+
+
+  test "behavior of 'content_blocks' route generator" do
+    rb = RouteBuilder.new
+
+    # Expect
+    rb.expects(:resources).with(:bears, {:member => {:publish => :put, :usages => :get, :versions => :get}})
+    rb.expects(:version_cms_bears).with("/cms/bears/:id/version/:version", :controller => "cms/bears", :action => "version", :conditions => {:method => :get})
+    rb.expects(:revert_to_cms_bears).with(
+            "/cms/bears/:id/revert_to/:version",
+            :controller => "cms/bears",
+            :action => "revert_to",
+            :conditions => {:method => :put})
+
+    rb.content_blocks :bears
+
+    # Verifies the exact messages being passed to the route generator
+  end
+
+  test "model names with s at the end behave identically (since content_blocks expects plural symbols)" do
+    rb = RouteBuilder.new
+
+    # Expect
+    rb.expects(:resources).with(:kindnesses, {:member => {:publish => :put, :usages => :get, :versions => :get}})
+    rb.expects(:version_cms_kindnesses).with("/cms/kindnesses/:id/version/:version", :controller => "cms/kindnesses", :action => "version", :conditions => {:method => :get})
+    rb.expects(:revert_to_cms_kindnesses).with(
+            "/cms/kindnesses/:id/revert_to/:version",
+            :controller => "cms/kindnesses",
+            :action => "revert_to",
+            :conditions => {:method => :put})
+
+    rb.content_blocks :kindnesses
+
+    # Verifies the exact messages being passed to the route generator
+  end
+  
+
+end