browsercms 3.0.6 → 3.1.0

data/test/unit/lib/cms/authentication/controller_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+require 'mocha'
+
+class ProtectedController < ActionController::Base
+  include Cms::Authentication::Controller
+end
+
+class ControllerTest < ActiveSupport::TestCase
+
+  test "Sets current user in thread local" do
+    u = User.new()
+
+    c = ProtectedController.new
+    c.expects(:session).returns({})
+
+    c.send(:current_user=, u)
+
+    assert_equal u, User.current
+  end
+end

data/test/unit/lib/cms_domain_support_test.rb

@@ -0,0 +1,43 @@
+require File.join(File.dirname(__FILE__), '/../../test_helper')
+require 'mocha'
+
+class CmsDomainSupportTest < ActiveSupport::TestCase
+
+  def setup
+
+  end
+
+  def teardown
+
+  end
+
+  test "cms_site? determines if the first subdomain is 'cms'" do
+    c = Cms::ApplicationController.new
+    request = mock
+
+    c.expects(:request).returns(request)
+    request.expects(:subdomains).returns(["cms"])
+
+    assert c.send :cms_site?
+  end
+
+   test "A url that isn't a cms domain" do
+    c = Cms::ApplicationController.new
+    request = mock
+
+    c.expects(:request).returns(request)
+    request.expects(:subdomains).returns(["www"])
+
+    assert_equal false, c.send(:cms_site?)
+   end
+
+  test "default cms domain" do
+    c = Cms::ApplicationController.new
+
+    assert_equal "cms", c.send(:cms_domain_prefix)
+  end
+
+  test "prepare_for_rendererable" do
+        
+  end
+end

data/test/unit/lib/command_line_test.rb

@@ -0,0 +1,70 @@
+require "test_helper"
+require "mocha"
+
+class CommandLineTest < ActiveSupport::TestCase
+
+  test "Use the correct demo template with '-m demo'" do
+    CommandLine.expects(:template).with("demo.rb").returns("./templates/demo.rb")
+    args = ["-m", "demo"]
+
+    CommandLine.set_template(args)
+
+    assert_equal ["-m", "./templates/demo.rb"], args
+  end
+
+  test "template_file looks up files based on the current directory" do
+    CommandLine.expects(:template_dir).returns("./templates")
+
+    assert_equal "./templates/bar.rb", CommandLine.template("bar.rb")
+  end
+
+  test "ARGV gets replaced" do
+    CommandLine.expects(:template).with("demo.rb").returns("./templates/demo.rb")
+    ARGV = ["-m", "demo"]
+
+    CommandLine.set_template(ARGV)
+
+    assert_equal ["-m", "./templates/demo.rb"], ARGV
+  end
+
+  test "Sets blank template if empty" do
+    CommandLine.expects(:template).with("blank.rb").returns("./templates/blank.rb")
+    args = []
+
+    CommandLine.set_template(args)
+
+    assert_equal ["-m", "./templates/blank.rb"], args
+  end
+
+  test "Sets module template with -m" do
+    CommandLine.expects(:template).with("module.rb").returns("./templates/module.rb")
+    args = ["-m", "module"]
+
+    CommandLine.set_template(args)
+
+    assert_equal ["-m", "./templates/module.rb"], args
+  end
+
+  test "Sets the module template with --template" do
+    CommandLine.expects(:template).with("module.rb").returns("./templates/module.rb")
+    args = ["--template", "module"]
+
+    CommandLine.set_template(args)
+
+    assert_equal ["--template", "./templates/module.rb"], args 
+  end
+
+  test "Sets the demo template with --template" do
+    CommandLine.expects(:template).with("demo.rb").returns("./templates/demo.rb")
+    args = ["--template", "demo"]
+
+    CommandLine.set_template(args)
+
+    assert_equal ["--template", "./templates/demo.rb"], args
+  end
+
+  test "Set usage" do
+    
+  end
+
+end

data/test/unit/lib/content_rendering_support_test.rb

@@ -0,0 +1,40 @@
+require "test_helper"
+
+class ContentRenderingSupportTest < ActiveSupport::TestCase
+
+  def setup
+
+  end
+
+  def teardown
+
+  end
+
+  test "still has error handling methods" do
+    c = Cms::ContentController.new
+    
+    assert c.respond_to? :handle_access_denied_on_page
+    assert c.respond_to? :handle_not_found_on_page
+    assert c.respond_to? :handle_server_error_on_page
+    assert c.respond_to? :handle_error_with_cms_page, true
+
+    assert(c.respond_to?(:logged_in?), "Should include Cms::Authentication::Controller methods")
+  end
+
+  class MyController < ActionController::Base
+    include Cms::ContentRenderingSupport
+  end
+
+  test "Arbitrary controller should have authentication methods" do
+    c = MyController.new
+
+    assert c.respond_to? :handle_access_denied_on_page
+    assert c.respond_to? :handle_not_found_on_page
+    assert c.respond_to? :handle_server_error_on_page
+    assert c.respond_to? :handle_error_with_cms_page, true
+
+    assert(!c.respond_to?(:logged_in?), "Should Not include Cms::Authentication::Controller methods")
+    assert(c.respond_to?(:handle_server_error), "Should include Cms::ErrorHandling methods")
+  end
+
+end

data/test/unit/models/content_type_test.rb

@@ -5,25 +5,37 @@ class Kindness < ActiveRecord::Base
   acts_as_content_block
 end
 
+class ReallyLongNameClass < ActiveRecord::Base
+  acts_as_content_block
+
+  def self.display_name
+    "Short"
+  end
+
+  def self.display_name_plural
+    "Shorteez"
+  end
+end
+
 class ContentTypeTest < ActiveSupport::TestCase
   def setup
-    @c = ContentType.new(:name => "HtmlBlock")
+    @c = ContentType.new(:name => "ReallyLongNameClass")
   end
 
   def test_model_class
-    assert_equal HtmlBlock, @c.model_class
+    assert_equal ReallyLongNameClass, @c.model_class
   end
 
-  def test_display_name
-    assert_equal "Text", @c.display_name
+  test "creating self.display_name on content block will set display_name on content type" do
+    assert_equal "Short", @c.display_name
   end
 
-  def test_display_name_plural
-    assert_equal "Text", @c.display_name_plural
+  test "creating self.display_name_plural on content block will set display_name_plural on content type" do
+    assert_equal "Shorteez", @c.display_name_plural
   end
 
   def test_content_block_type
-    assert_equal "html_blocks", @c.content_block_type
+    assert_equal "really_long_name_classes", @c.content_block_type
   end
 
   test "find_by_key handles names that end with s correctly" do

data/test/unit/models/page_template_test.rb

@@ -33,5 +33,8 @@ class PageTemplateTest < ActiveSupport::TestCase
     assert_nil PageTemplate.find_by_file_name("fail")
     assert_nil PageTemplate.find_by_file_name(nil)  
   end
-  
+
+  def test_default_body
+    assert_not_nil PageTemplate.default_body
+  end
 end

data/test/unit/models/portlet_test.rb

@@ -1,5 +1,22 @@
 require File.join(File.dirname(__FILE__), '/../../test_helper')
 
+# For some reason, these Portlet classes cannot be defined within the PortletTest class. Something
+# related to the dynamic attributes causes other tests to fail.
+class NoInlinePortlet < Portlet
+  render_inline false
+end
+class InlinePortlet < Portlet
+end
+
+class NonEditablePortlet < Portlet
+  enable_template_editor false
+end
+
+class EditablePortlet < Portlet
+  enable_template_editor true
+end
+
+
 class PortletTest < ActiveSupport::TestCase
 
   def test_dynamic_attributes
@@ -9,7 +26,7 @@ class PortletTest < ActiveSupport::TestCase
   end
 
   def test_portlets_consistently_load_the_same_number_of_types
-    
+
     list = Portlet.types
     assert list.size > 0
 
@@ -18,4 +35,35 @@ class PortletTest < ActiveSupport::TestCase
 
     assert_equal list.size, Portlet.types.size
   end
+
+
+  test "render_inline" do
+      assert_equal false, NoInlinePortlet.render_inline
+  end
+
+  test "Portlets should default to render_inline is true" do
+    assert InlinePortlet.render_inline
+  end
+
+  test "allow_template_editing" do
+    assert_equal true, EditablePortlet.render_inline
+
+    assert_equal false, NonEditablePortlet.render_inline
+  end
+
+  test "If render_inline is true, should return the value of 'template'" do
+    p = EditablePortlet.new
+    p.template = "<b>CODE HERE</b>"
+
+    assert_equal p.template, p.inline_options[:inline]
+  end
+  test "If render_inline is true, but template is blank, don't render inline" do
+    p = EditablePortlet.new
+
+    p.template = nil
+    assert_equal({}, p.inline_options)
+
+    p.template = ""
+    assert_equal({}, p.inline_options)
+  end
 end

data/test/unit/models/sections_test.rb

@@ -51,6 +51,18 @@ class SectionTest < ActiveSupport::TestCase
     
     assert_equal @a2, @a.first_page_or_link
   end
+
+  def test_find_first_page_or_link_after_delete
+    @a = Factory(:section, :parent => root_section, :name => "A")
+    @a1 = Factory(:page, :section => @a, :name => "A1")
+    @a2 = Factory(:page, :section => @a, :name => "A2")
+    @a3 = Factory(:page, :section => @a, :name => "A3")
+    assert_equal @a1, @a.first_page_or_link
+    @a1.destroy
+    
+    assert_equal @a2, @a.first_page_or_link
+  end
+
   
   def test_find_by_name_path
     @a = Factory(:section, :parent => root_section, :name => "A")
@@ -121,5 +133,32 @@ class SectionTest < ActiveSupport::TestCase
     @section = Section.new(:name => "FTW", :path => "/whatever")
     assert_valid @section
   end  
-  
-end
+
+  def test_old_syntax_for_marking_group_sections
+    groups = Group.all(&:id)
+    assert_equal Group, groups[0].class, "This is previous"
+
+    groups = Group.all()
+    assert_equal Group, groups[0].class, "No difference between this and the previous call."
+
+    group_ids = Group.all.map(&:id)
+    assert_equal Fixnum, group_ids[0].class
+  end
+
+  def test_new_section_with_groups
+    section = Section.new(:allow_groups=>:all)
+    assert_equal Group.all, section.groups
+
+  end
+
+  def test_new_section_with_no_groups
+    s = Section.new(:allow_groups=>:none)
+    assert_equal 0, s.groups.size
+  end
+
+  def test_create_section
+    s = Section.create!(:name=>"For All", :path=>"/", :allow_groups=>:all)
+
+    assert_equal Group.count, Section.with_path("/").first.groups.size
+  end
+end

data/test/unit/models/task_test.rb

@@ -3,13 +3,14 @@ require File.join(File.dirname(__FILE__), '/../../test_helper')
 class TaskTest < ActiveSupport::TestCase
   def setup
     super
-    @editor_a = create_admin_user(:login => "editor_a", :email => "editor_a@example.com")    
+    @editor_a = create_admin_user(:login => "editor_a", :email => "editor_a@example.com")
     @editor_b = create_admin_user(:login => "editor_b", :email => "editor_b@example.com")
     @non_editor = Factory(:user, :login => "non_editor", :email => "non_editor@example.com")
-    @page = Factory(:page, :name => "Task Test", :path => "/task_test")          
+    @page = Factory(:page, :name => "Task Test", :path => "/task_test")
+    @page2 = Factory(:page, :name => "Task Test 2", :path => "/task_test_2")
   end
 end
-  
+
 class CreateTaskTest < TaskTest
 
   def test_create_task
@@ -17,13 +18,14 @@ class CreateTaskTest < TaskTest
     assert_that_an_assigned_by_user_that_is_an_editor_is_required
     assert_that_an_assigned_to_user_that_is_an_editor_is_required
     assert_that_a_page_is_required
-  
+
     create_the_task!
-  
+    create_the_second_task!
+
     assert !@task.completed?
     assert(@task.due_date < Time.now)
     assert_equal "Howdy!", @task.comment
-  
+
     assert_that_an_email_is_sent_to_the_user_the_task_was_assigned_to
     assert_that_the_page_is_assigned_to_the_assigned_to_user
     assert_that_the_task_is_added_to_the_users_incomplete_tasks
@@ -44,38 +46,47 @@ class CreateTaskTest < TaskTest
       assert_not_valid task
       assert_has_error_on task, :assigned_by_id, "cannot assign tasks"
     end
-  
+
     def assert_that_an_assigned_to_user_that_is_an_editor_is_required
       task = Factory.build(:task, :assigned_by => @editor_a, :assigned_to => nil)
       assert_not_valid task
-      assert_has_error_on task, :assigned_to_id, "is required"    
+      assert_has_error_on task, :assigned_to_id, "is required"
 
       task = Factory.build(:task, :assigned_by => @editor_a, :assigned_to => @non_editor)
       assert_not_valid task
-      assert_has_error_on task, :assigned_to_id, "cannot be assigned tasks"      
+      assert_has_error_on task, :assigned_to_id, "cannot be assigned tasks"
     end
-  
+
     def assert_that_a_page_is_required
       task = Factory.build(:task, :page => nil)
       assert_not_valid task
-      assert_has_error_on task, :page_id, "is required"      
+      assert_has_error_on task, :page_id, "is required"
     end
 
     def create_the_task!
       @task = Task.create!(
-        :assigned_by => @editor_a, 
+        :assigned_by => @editor_a,
         :assigned_to => @editor_b,
         :due_date => 5.minutes.ago,
         :comment => "Howdy!",
-        :page => @page)      
+        :page => @page)
+    end
+
+    def create_the_second_task!
+      @task2 = Task.create!(
+        :assigned_by => @editor_a,
+        :assigned_to => @editor_b,
+        :due_date => 1.minutes.ago,
+        :comment => "Howdy Again!",
+        :page => @page2)
     end
 
     def assert_that_an_email_is_sent_to_the_user_the_task_was_assigned_to
-      email = EmailMessage.first(:order => "created_at desc")
+      email = EmailMessage.first(:order => "id asc")
       assert_equal @editor_a.email, email.sender
       assert_equal @editor_b.email, email.recipients
       assert_equal "Page '#{@page.name}' has been assigned to you", email.subject
-      assert_equal "http://#{SITE_DOMAIN}#{@page.path}\n\n#{@task.comment}", email.body      
+      assert_equal "http://cms.#{SITE_DOMAIN}#{@page.path}\n\n#{@task.comment}", email.body
     end
 
     def assert_that_the_page_is_assigned_to_the_assigned_to_user
@@ -84,12 +95,16 @@ class CreateTaskTest < TaskTest
     end
 
     def assert_that_the_task_is_added_to_the_users_incomplete_tasks
-      assert !@editor_a.tasks.incomplete.all.include?(@task), 
+      assert !@editor_a.tasks.incomplete.all.include?(@task),
         "Expected Editor A's incomplete tasks not to include the task"
+      assert !@editor_a.tasks.incomplete.all.include?(@task2),
+        "Expected Editor A's incomplete tasks not to include the second task"
       assert @editor_b.tasks.incomplete.all.include?(@task),
-        "Expected Editor B's incomplete tasks to include the task"      
+        "Expected Editor B's incomplete tasks to include the task"
+      assert @editor_b.tasks.incomplete.all.include?(@task2),
+        "Expected Editor B's incomplete tasks to include the second task"
     end
-  
+
 end
 
 class ExistingIncompleteTaskTest < TaskTest
@@ -100,7 +115,7 @@ class ExistingIncompleteTaskTest < TaskTest
 
   def test_create_task_for_a_page_with_existing_incomplete_tasks
     assert !@existing_task.completed?
-    
+
     @new_task = Factory(:task, :assigned_by => @editor_b, :assigned_to => @editor_a, :page => @page)
     @existing_task = Task.find(@existing_task.id)
 
@@ -115,12 +130,12 @@ class ExistingIncompleteTaskTest < TaskTest
   def test_completing_a_task
     assert !@existing_task.completed?
     assert_equal @editor_b, @page.assigned_to
-    assert @editor_b.tasks.incomplete.all.include?(@existing_task)    
+    assert @editor_b.tasks.incomplete.all.include?(@existing_task)
 
     @existing_task.mark_as_complete!
-    
+
     assert @existing_task.completed?
     assert @page.assigned_to.nil?
-    assert !@editor_b.tasks.incomplete.all.include?(@existing_task)    
+    assert !@editor_b.tasks.incomplete.all.include?(@existing_task)
   end
 end