browsercms 3.1.4 → 3.1.5

data/test/fixtures/pages.yml

@@ -0,0 +1,85 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+page_1:
+  name: Home
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_by_id: 1
+  title: 
+  language: 
+  published: true
+  template_file_name: default
+  lock_version: 2
+  id: 1
+  created_by_id: 1
+  version: 3
+  description: 
+  archived: false
+  deleted: false
+  path: /
+  keywords: 
+  hidden: false
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  cacheable: true
+
+page_2:
+  name: Not Found
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_by_id: 1
+  title: 
+  language: 
+  published: true
+  template_file_name: default.html.erb
+  lock_version: 2
+  id: 2
+  created_by_id: 1
+  version: 3
+  description: 
+  archived: false
+  deleted: false
+  path: /system/not_found
+  keywords: 
+  hidden: true
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  cacheable: true
+
+page_3:
+  name: Access Denied
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_by_id: 1
+  title: 
+  language: 
+  published: true
+  template_file_name: default.html.erb
+  lock_version: 2
+  id: 3
+  created_by_id: 1
+  version: 3
+  description: 
+  archived: false
+  deleted: false
+  path: /system/access_denied
+  keywords: 
+  hidden: true
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  cacheable: true
+
+page_4:
+  name: Server Error
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_by_id: 1
+  title: 
+  language: 
+  published: true
+  template_file_name: default.html.erb
+  lock_version: 2
+  id: 4
+  created_by_id: 1
+  version: 3
+  description: 
+  archived: false
+  deleted: false
+  path: /system/server_error
+  keywords: 
+  hidden: true
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  cacheable: true
+

data/test/fixtures/permissions.yml

@@ -0,0 +1,28 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+permission_1:
+  name: administrate
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  id: 1
+  for_module: 
+  description: Allows users to administer the CMS, including adding users and groups.
+  full_name: Administrate CMS
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+permission_2:
+  name: edit_content
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  id: 2
+  for_module: 
+  description: Allows users to Add, Edit and Delete both Pages and Blocks. Can Save (but not Publish) and Assign them as well.
+  full_name: Edit Content
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+permission_3:
+  name: publish_content
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  id: 3
+  for_module: 
+  description: Allows users to Save and Publish, Hide and Archive both Pages and Blocks.
+  full_name: Publish Content
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+

data/test/fixtures/section_nodes.yml

@@ -0,0 +1,46 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+section_node_1:
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  node_type: Section
+  id: 1
+  ancestry: 1
+  node_id: 2
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+section_node_2:
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  node_type: Page
+  ancestry: 1
+  id: 2
+  node_id: 1
+  position: 2
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+section_node_3:
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  node_type: Page
+  ancestry: 1/2
+  id: 3
+  node_id: 2
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+section_node_4:
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  node_type: Page
+  ancestry: 1/2
+  id: 4
+  node_id: 3
+  position: 2
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+section_node_5:
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  node_type: Page
+  ancestry: 1/2
+  id: 5
+  node_id: 4
+  position: 3
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+

data/test/fixtures/sections.yml

@@ -0,0 +1,19 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+section_1:
+  name: My Site
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  id: 1
+  root: true
+  path: /
+  hidden: false
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+
+section_2:
+  name: system
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  id: 2
+  root: false
+  path: /system
+  hidden: true
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+

data/test/fixtures/sites.yml

@@ -0,0 +1,9 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+site_1:
+  name: Default
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  the_default: true
+  domain: example.com
+  id: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+

data/test/fixtures/user_group_memberships.yml

@@ -0,0 +1,11 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+user_group_membership_1:
+  id: 1
+  group_id: 2
+  user_id: 1
+
+user_group_membership_2:
+  id: 2
+  group_id: 3
+  user_id: 1
+

data/test/fixtures/users.yml

@@ -0,0 +1,15 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+user_1:
+  salt: d193b3629a4805ec6a9cabf2d5336aed56ec4533
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  expires_at: 
+  crypted_password: 763ef0d40c98bff03ab3762e0865c12bd76f4607
+  remember_token_expires_at: 
+  id: 1
+  remember_token: 
+  first_name: CMS
+  login: cmsadmin
+  last_name: Administrator
+  email: cmsadmin@example.com
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+

data/test/functional/cms/content_controller_test.rb

@@ -3,6 +3,10 @@ require File.join(File.dirname(__FILE__), '/../../test_helper')
 class Cms::ContentControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
 
+  def setup
+    given_a_site_exists
+  end
+
   def test_show_home_page
     get :show
     assert_response :success
@@ -19,7 +23,6 @@ class Cms::ContentControllerTest < ActionController::TestCase
     get :show, :path => ["foo"]
     assert_response :not_found
     assert_select "title", "Not Found"
-    assert_select "h1", "Page Not Found"
   end
 
   def test_page_not_found_to_cms_admin
@@ -312,6 +315,8 @@ class Cms::ContentCachingDisabledControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
 
   def setup
+    given_a_site_exists
+
     ActionController::Base.perform_caching = false
     @page = Factory(:page, :section => root_section, :name => "Test Page", :path => "/page", :publish_on_save => true)
     @registered_user = Factory(:user)

data/test/functional/cms/file_blocks_controller_test.rb

@@ -4,6 +4,7 @@ class Cms::FileBlocksControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
 
   def setup
+    given_a_site_exists
     login_as_cms_admin
   end
   

data/test/functional/cms/html_blocks_controller_test.rb

@@ -4,6 +4,7 @@ class Cms::HtmlBlocksControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
   
   def setup
+    given_a_site_exists
     login_as_cms_admin
     @block = Factory(:html_block, :name => "Test", :content => "I worked.", :publish_on_save => true)
   end

data/test/functional/cms/image_blocks_controller_test.rb

@@ -4,6 +4,7 @@ class Cms::ImageBlocksControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
 
   def setup
+    given_a_site_exists
     login_as_cms_admin
   end
   
@@ -12,38 +13,7 @@ class Cms::ImageBlocksControllerTest < ActionController::TestCase
     assert_response :success
     assert_select "title", "Content Library / Add New Image"
   end
-  
-  def test_edit
-    @image = Factory(:image_block, 
-      :attachment_section => root_section, 
-      :attachment_file => mock_file, 
-      :attachment_file_path => "test.jpg")
-    
-    get :edit, :id => @image.id
-  
-    assert_response :success
-    assert_equal root_section.id, assigns(:block).attachment_section_id
-    assert_select "title", "Content Library / Edit Image"
-    assert_select "h1", "Edit Image '#{@image.name}'"
-    assert_select "select[name=?]", "image_block[attachment_section_id]" do
-      assert_select "option[value=?][selected=?]", root_section.id, "selected"
-    end
-  end
-  
-  def test_update_image
-    @image = Factory(:image_block, 
-      :attachment_section => root_section, 
-      :attachment_file => mock_file, 
-      :attachment_file_path => "test.jpg")
-    @other_section = Factory(:section, :parent => root_section, :name => "Other")
-    
-    put :update, :id => @image.id, :image_block => {:attachment_section_id => @other_section.id}
-    reset(:image)
 
-    assert_redirected_to [:cms, @image]
-    assert_equal @other_section, @image.attachment_section
-  end  
-  
   def test_revert_to
     @image = Factory(:image_block, 
       :attachment_section => root_section,
@@ -71,5 +41,42 @@ class Cms::ImageBlocksControllerTest < ActionController::TestCase
     assert_equal "22222", File.read(@image.attachment.full_file_location)
     assert_equal "11111", File.read(@draft_image.attachment.full_file_location)
   end
-  
+
+end
+
+class Cms::MoveImageBlocks < ActionController::TestCase
+  include Cms::ControllerTestHelper
+  tests Cms::ImageBlocksController
+
+  def setup
+    given_a_site_exists
+    login_as_cms_admin
+
+    @image = Factory(:image_block,
+      :attachment_section => root_section,
+      :attachment_file => mock_file,
+      :attachment_file_path => "test.jpg")
+  end
+
+  def test_edit
+    get :edit, :id => @image.id
+
+    assert_response :success
+    assert_equal root_section.id, assigns(:block).attachment_section_id
+    assert_select "title", "Content Library / Edit Image"
+    assert_select "h1", "Edit Image '#{@image.name}'"
+    assert_select "select[name=?]", "image_block[attachment_section_id]" do
+      assert_select "option[value=?][selected=?]", root_section.id, "selected"
+    end
+  end
+
+  def test_update_image
+    @other_section = Factory(:public_section, :parent => root_section, :name => "Other")
+
+    put :update, :id => @image.id, :image_block => {:attachment_section_id => @other_section.id}
+    reset(:image)
+
+    assert_redirected_to [:cms, @image]
+    assert_equal @other_section, @image.attachment.section
+  end
 end

data/test/functional/cms/section_nodes_controller_test.rb

@@ -2,7 +2,12 @@ require File.join(File.dirname(__FILE__), '/../../test_helper')
 
 class Cms::SectionNodesControllerTest < ActionController::TestCase
   include Cms::ControllerTestHelper
-  
+
+  def setup
+    remove_all_sitemap_fixtures_to_avoid_bugs
+    given_a_site_exists
+  end
+
   def test_index_as_admin
     login_as_cms_admin
     @foo = Factory(:section, :name => "Foo", :parent => root_section)
@@ -13,7 +18,7 @@ class Cms::SectionNodesControllerTest < ActionController::TestCase
     assert_select "title", "Sitemap"
     assert_select "h1", "Sitemap"
     assert_select "#sitemap" do
-      assert_select "ul#root_1" do
+      assert_select "ul#root_#{root_section.id}" do
         assert_select "#section_#{root_section.id}" do
           assert_select "div", "My Site"
         end
@@ -32,52 +37,75 @@ class Cms::SectionNodesControllerTest < ActionController::TestCase
             assert_select "div", "Test Page"
           end
         end
-      end      
+      end
     end
   end
-  
+
 end
 
 class Cms::SectionNodesControllerPermissionsTest < ActionController::TestCase
   tests Cms::SectionNodesController
   include Cms::ControllerTestHelper
-  
+
   def setup
+    given_a_site_exists
+
+    @user = Factory(:content_editor)
     # DRYME copypaste from UserPermissionTest
-    @user = Factory(:user)
     login_as(@user)
     @group = Factory(:group, :name => "Test", :group_type => Factory(:group_type, :name => "CMS User", :cms_access => true))
     @group.permissions << create_or_find_permission_named("edit_content")
     @group.permissions << create_or_find_permission_named("publish_content")
     @user.groups << @group
-    
+
     @editable_section = Factory(:section, :parent => root_section, :name => "Editable")
-    @group.sections << @editable_section
+    @group.sections << @editable_section << root_section
     @editable_page = Factory(:page, :section => @editable_section, :name => "Editable Page")
     @editable_link = Factory(:link, :section => @editable_section, :name => "Editable Link")
-    
+
     @noneditable_section = Factory(:section, :parent => root_section, :name => "Not Editable")
     @noneditable_page = Factory(:page, :section => @noneditable_section, :name => "Non-Editable Page")
     @noneditable_link = Factory(:link, :section => @noneditable_section, :name => "Non-Editable Link")
-    
+
     @noneditables = [@noneditable_section, @noneditable_page, @noneditable_link]
-    @editables = [@editable_section,
-      @editable_page, 
-      @editable_link,]
+    @editables = [@editable_section, @editable_page, @editable_link]
+    verify_user_cannot_edit
+    verify_user_can_edit
   end
-  
+
   def test_index_as_contributor_with_subsections
     get :index
+
     assert_response :success
-    
-    # Check that each non-editable has the non-editable class, and that each editable does not have
-    # the non-editable class
-    @noneditables.each do |ne|
+
+    user_shouldnt_not_be_able_to_edit(@noneditables)
+    user_should_be_able_to_edit(@editables)
+  end
+
+  private
+
+  def user_shouldnt_not_be_able_to_edit(sections)
+    sections.each do |ne|
       assert_select "td.node.non-editable div", ne.name
     end
-    @editables.each do |e|
+  end
+
+  def user_should_be_able_to_edit(user_should_be_able_to_edit)
+    user_should_be_able_to_edit.each do |e|
       td = css_select("td##{e.class.to_s.underscore}_#{e.id}", e.name).first
-      assert !td.attributes["class"].include?("non-editable")
+      assert !td.attributes["class"].include?("non-editable"), "Looking at #{td}, was editable."
+    end
+  end
+
+  def verify_user_can_edit
+    @editables.each do |node|
+      assert_equal true, @user.able_to_modify?(node), "Should be able to edit #{node}"
+    end
+  end
+
+  def verify_user_cannot_edit
+    @noneditables.each do |node|
+      assert_equal false, @user.able_to_modify?(node), "Shouldnt be able to edit #{node}"
     end
   end
 end