browsercms 3.4.2 → 3.5.0.rc1

data/test/functional/cms/dashboard_controller_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-module Cms
-class DashboardControllerTest < ActionController::TestCase
-  include Cms::ControllerTestHelper
-  
-  def setup
-    login_as_cms_admin
-  end
-  
-  def test_index
-    get :index
-    
-    assert_response :success
-    assert_select "title", "Dashboard"
-  end
-
-  
-end
-end

data/test/functional/cms/file_blocks_controller_test.rb

@@ -1,55 +0,0 @@
-require 'test_helper'
-
-module Cms
-class FileBlocksControllerTest < ActionController::TestCase
-  include Cms::ControllerTestHelper
-
-  def setup
-    given_a_site_exists
-    login_as_cms_admin
-    given_there_is_a_content_type(Cms::FileBlock)
-  end
-  
-  def test_file_block_search
-    @file = mock_file()
-    @file_block = Factory(:file_block, :attachment_section => root_section, 
-      :attachment_file => @file, 
-      :attachment_file_path => "/test.txt", 
-      :name => "Test File", 
-      :publish_on_save => true)
-    @foo_section = Factory(:section, :name => "Foo", :parent => root_section)
-
-    get :index, :section_id => root_section.id
-    assert_response :success
-    assert_select "td", "Test File"
-
-    get :index, :section_id => @foo_section.id
-    assert_response :success
-    assert_select "td", {:count => 0, :text => "Test File"}
-
-    get :index, :section_id => 'all'
-    assert_response :success
-    assert_select "td", "Test File"
-  end
-
-  #
-  # Fix for #33
-  #
-  def test_view_file_block_doesnt_have_view_error
-    @file = mock_file()
-    @file_block = Factory(:file_block, :attachment_section => root_section,
-      :attachment_file => @file,
-      :attachment_file_path => "/test.txt",
-      :name => "Test File",
-      :publish_on_save => true)
-    @foo_section = Factory(:section, :name => "Foo", :parent => root_section)
-
-    get :show, :id => @file_block.id
-
-    assert_response :success
-    assert_select "div#file_block_#{@file_block.id}", true, "Should render the file_blocks/render.html.erb partial correctly."
-
-  end
-
-end
-end

data/test/functional/cms/home_controller_test.rb

@@ -1,160 +0,0 @@
-require 'test_helper'
-
-module Cms
-class HomeControllerTest < ActionController::TestCase
-  include Cms::ControllerTestHelper
-
-  test "behavior of request" do
-    @request.host = "www.browsercms.org"
-    @request.path = "/something"
-    assert_equal @request.url, "http://www.browsercms.org/something"
-  end
-  def test_cms_site_with_public_site
-    @request.host = "foo.com"
-    assert !@controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_public_site_www
-    @request.host = "www.foo.com"
-    assert !@controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_cms_site
-    @request.host = "cms.foo.com"
-    assert @controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_cms_site_www
-    @request.host = "www.cms.foo.com"
-    assert @controller.send(:cms_site?)    
-  end
-  
-  def test_url_with_cms_domain_prefix_with_public_site
-    @request.host = "foo.com"
-    @request.path = "/cms"
-    assert_equal "http://cms.foo.com/cms", 
-      @controller.send(:url_with_cms_domain_prefix)
-  end
-  
-  def test_url_with_cms_domain_prefix_with_public_site_www
-    @request.host = "www.foo.com"
-    @request.path = "/cms"
-    assert_equal "http://cms.foo.com/cms", @controller.send(:url_with_cms_domain_prefix)
-  end
-
-  def test_url_with_cms_domain_prefix_with_cms_site
-    @request.host = "cms.foo.com"
-    @request.path = "/cms"
-
-    assert_equal "http://cms.foo.com/cms", @controller.send(:url_with_cms_domain_prefix)
-  end
-
-  def test_url_with_cms_domain_prefix_with_cms_site_www
-    @request.host = "www.cms.foo.com"
-    @request.path = "/cms"
-    assert_equal "http://www.cms.foo.com/cms", @controller.send(:url_with_cms_domain_prefix)
-  end
-  
-  def test_redirected_to_cms_site_if_public_site
-    @request.host = "foo.com"
-    get :index
-    assert_redirected_to "http://foo.com/cms/login"
-  end
-
-  def test_redirected_to_cms_site_if_public_site_and_logged_in
-    login_as_cms_admin
-    @request.host = "foo.com"
-    get :index
-    assert_redirected_to "http://foo.com/"
-  end
-  
-  def test_success_if_cms_site_and_logged_in
-    login_as_cms_admin    
-    @request.host = "cms.foo.com"    
-    get :index
-    assert_redirected_to "http://cms.foo.com/"
-  end  
-  
-end
-
-class HomeControllerCachingEnabledTest < ActionController::TestCase
-  include Cms::ControllerTestHelper
-  tests Cms::HomeController
-  
-  def setup
-    @controller.perform_caching = true
-  end
-  
-  def teardown
-    @controller.perform_caching = false
-  end
-  
-  def test_cms_site_with_public_site
-    @request.host = "foo.com"
-    assert !@controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_public_site_www
-    @request.host = "www.foo.com"
-    assert !@controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_cms_site
-    @request.host = "cms.foo.com"
-    assert @controller.send(:cms_site?)
-  end
-  
-  def test_cms_site_with_cms_site_www
-    @request.host = "www.cms.foo.com"
-    assert @controller.send(:cms_site?)    
-  end
-  
-  def test_url_with_cms_domain_prefix_with_public_site
-    @request.host = "foo.com"
-    @request.path = "/cms"
-    assert_equal "http://cms.foo.com/cms", 
-      @controller.send(:url_with_cms_domain_prefix)
-  end
-  
-  test "url_with_cms_domain_prefix_with_public_site_www" do
-    @request.host = "www.foo.com"
-    @request.path = "/cms"
-    assert_equal "http://cms.foo.com/cms",  @controller.send(:url_with_cms_domain_prefix)
-  end
-
-  def test_url_with_cms_domain_prefix_with_cms_site
-    @request.host = "cms.foo.com"
-    @request.path = "/cms"
-    assert_equal "http://cms.foo.com/cms", 
-      @controller.send(:url_with_cms_domain_prefix)
-  end
-
-  def test_url_with_cms_domain_prefix_with_cms_site_www
-    @request.host = "www.cms.foo.com"
-    @request.path = "/cms"
-    assert_equal "http://www.cms.foo.com/cms", 
-      @controller.send(:url_with_cms_domain_prefix)
-  end
-  
-  def test_redirected_to_cms_site_if_public_site
-    @request.host = "foo.com"
-    get :index
-    assert_redirected_to "http://cms.foo.com/cms"
-  end
-
-  def test_redirected_to_cms_site_if_public_site_and_logged_in
-    login_as_cms_admin
-    @request.host = "foo.com"
-    get :index
-    assert_redirected_to "http://cms.foo.com/cms"
-  end
-  
-  def test_success_if_cms_site_and_logged_in
-    login_as_cms_admin    
-    @request.host = "cms.foo.com"    
-    get :index
-    assert_redirected_to "http://cms.foo.com/"
-  end  
-  
-end
-end

data/test/functional/cms/html_blocks_controller_test.rb

@@ -1,159 +0,0 @@
-require 'test_helper'
-
-module Cms
-class HtmlBlocksControllerTest < ActionController::TestCase
-  include Cms::ControllerTestHelper
-  
-  def setup
-    given_a_site_exists
-    login_as_cms_admin
-    given_there_is_a_content_type(Cms::HtmlBlock)
-    @block = Factory(:html_block, :name => "Test", :content => "I worked.", :publish_on_save => true)
-  end
-  
-  def test_new
-    get :new
-    assert_response :success    
-    assert_select "h1", "Add New Text"
-  end
-
-  def test_add_to_page
-    @page = Factory(:page, :path => "/test", :section => root_section)
-    get :new, :html_block => {:connect_to_page_id => @page.id, :connect_to_container => "test"}
-    assert_response :success
-    assert_select "input[name=?][value=?]", "html_block[connect_to_page_id]", @page.id.to_s
-    assert_select "input[name=?][value=?]", "html_block[connect_to_container]", "test"
-  end
-  
-  def test_show
-    get :show, :id => @block.id, :format => "html"
-
-    assert_response :success
-    log @response.body
-    assert_select "div.content", "I worked."
-    assert_select "a.disabled span", "Publish"
-    assert_select ".block_published_status", "published"
-  end
-  
-  def test_show_draft
-    @block.update_attributes(:content => "Something Different")
-    
-    get :show, :id => @block.id, :format => "html"
-
-    assert_response :success
-    log @response.body
-    assert_select "div.content", "Something Different"
-    assert_select "a.disabled span", :text => "Publish", :count => 0
-    assert_select "a.button span", :text => "Publish", :count => 1    
-    assert_select ".block_published_status", "draft"
-  end
-  
-  def test_creating_a_block_that_should_be_connected_to_a_page
-    @page = Factory(:page, :path => "/test", :section => root_section)
-    html_block_count = HtmlBlock.count
-
-    post :create, :html_block => Factory.attributes_for(:html_block).merge(
-      :connect_to_page_id => @page.id, :connect_to_container => "test")
-      
-    assert_incremented html_block_count, HtmlBlock.count
-    assert_equal "test", @page.reload.connectors.first.container
-    assert_redirected_to @page.path
-  end  
-
-  def test_search
-    get :index, :search => {:term => 'test'}
-    assert_response :success
-    assert_select "td", "Test"
-
-    get :index, :search => {:term => 'worked', :include_body => true }
-    assert_response :success
-    assert_select "td", "Test"
-
-    get :index, :search => {:term => 'invalid'}
-    assert_response :success
-    assert_select "td", {:count=>0, :text=>"Test"}
-  end
-  
-  def test_edit
-    get :edit, :id => @block.id
-    assert_response :success
-    assert_select "input[id=?][value=?]", "html_block_name", "Test"
-  end  
-  
-  
-  def test_update
-    html_block_count = HtmlBlock.count
-    html_block_version_count = HtmlBlock::Version.count
-    
-    put :update, :id => @block.id, :html_block => {:name => "Test V2"}
-    reset(:block)
-
-    assert_redirected_to @block
-    assert_equal html_block_count, HtmlBlock.count
-    assert_incremented html_block_version_count, HtmlBlock::Version.count
-    assert_equal "Test V2",  @block.draft.name
-    assert_equal "Html Block 'Test V2' was updated", flash[:notice]
-  end
-    
-  def test_publish
-    @block.update_attributes(:content => "Something Different")
-    
-    assert !@block.live?
-
-    put :publish, :id => @block.id
-    reset(:block)
-
-    assert_redirected_to @block
-    assert @block.reload.live?
-  end  
-  
-  def test_versions
-    get :versions, :id => @block.id
-    assert_response :success
-    assert_equal @block, assigns(:block)
-  end  
-  
-  def test_revert_to
-    @block.update_attributes(:name => "Test V2")
-    reset(:block)
-    
-    put :revert_to, :id => @block.id, :version => "1"
-    reset(:block)
-    
-    assert_equal 3, @block.draft.version
-    assert_equal "Test", @block.reload.name
-    assert_equal "Html Block 'Test' was reverted to version 1", flash[:notice]
-    assert_redirected_to @block
-  end
-  
-  def test_revert_to_with_invalid_version_parameter
-    @block.update_attributes(:name => "Test V2", :publish_on_save => true)
-    reset(:block)
-
-    html_block_version_count = HtmlBlock::Version.count
-    
-    put :revert_to, :id => @block.id, :version => 99
-    reset(:block)
-    
-    assert_equal html_block_version_count, HtmlBlock::Version.count
-    assert_equal "Html Block 'Test V2' could not be reverted to version 99", flash[:error]
-    assert_redirected_to  @block
-  end
-  
-  def test_usages
-    @page = Factory(:page, :section => root_section, :name => "Included")
-    @page2 = Factory(:page, :section => root_section, :path => "/other_path", :name => "Excluded")
-    @block = Factory(:html_block, :connect_to_page_id => @page.id, :connect_to_container => "main")
-    @page.publish!  # usages are only relevant when page is published
-
-    get :usages, :id => @block.id
-
-    assert_response :success
-    assert_select "h1", "Pages Using Text '#{@block.name}'"
-    assert_select "td.page_name", "Included"
-    assert_select "td.page_name", {:count => 0, :text => "Excluded"}
-    assert_select "h3", "Content Types"
-  end
-  
-end
-end

data/test/functional/cms/image_blocks_controller_test.rb

@@ -1,78 +0,0 @@
-require 'test_helper'
-
-module Cms
-
-  # As these tests break, move them to features/content_blocks/manage_image_blocks.feature
-  class ImageBlocksControllerTest < ActionController::TestCase
-    include Cms::ControllerTestHelper
-
-    def setup
-      given_a_site_exists
-      login_as_cms_admin
-      given_there_is_a_sitemap
-      given_there_is_a_content_type(Cms::ImageBlock)
-    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 @image
-      assert_equal @other_section, @image.attachment_section
-    end
-
-    def test_revert_to
-      @image = Factory(:image_block,
-                       :attachment_section => root_section,
-                       :attachment_file => mock_file(:original_filename => "version1.txt"),
-                       :attachment_file_path => "test.jpg",
-                       :publish_on_save => true)
-      @image.update_attributes(:attachment_file => mock_file(:original_filename => "version2.txt"), :publish_on_save => true)
-      reset(:image)
-
-      assert @image.live?
-      assert_equal 2, @image.version
-      assert_equal 2, @image.attachment_version
-      assert_equal "v2", File.read(@image.attachment.full_file_location)
-
-      put :revert_to, :id => @image.id, :version => "1"
-      reset(:image)
-
-      assert_redirected_to @image
-      assert !@image.live?
-      @draft_image = @image.as_of_draft_version
-      assert_equal 2, @image.version
-      assert_equal 2, @image.attachment_version
-      assert_equal 3, @draft_image.version
-      assert_equal 3, @draft_image.attachment_version
-      assert_equal "v2", File.read(@image.attachment.full_file_location)
-      assert_equal "v1", File.read(@draft_image.attachment.full_file_location)
-    end
-
-  end
-
-end