comfortable_mexican_sofa 1.12.2 → 1.12.3

data/test/generators/cms_views_generator_test.rb

@@ -0,0 +1,12 @@
+require_relative '../test_helper'
+require_relative '../../lib/generators/comfy/cms/views_generator'
+
+class CmsViewsGeneratorTest < Rails::Generators::TestCase
+  tests Comfy::Generators::Cms::ViewsGenerator
+
+  def test_generator
+    run_generator
+    assert_directory 'app/views/comfy'
+    assert_file 'app/views/comfy/admin/cms/pages/index.html.haml'
+  end
+end

data/test/generators/scaffold_generator_test.rb

@@ -3,29 +3,28 @@ require_relative '../../lib/generators/comfy/scaffold/scaffold_generator'
 
 class ScaffoldGeneratorTest < Rails::Generators::TestCase
   tests Comfy::Generators::ScaffoldGenerator
-  
+
   def test_generator
     run_generator %w(Foo bar:string)
-    
+
     assert_migration 'db/migrate/create_foos.rb', read_file('scaffold/migration.rb')
     assert_file 'app/models/foo.rb',              read_file('scaffold/model.rb')
     assert_file 'test/models/foo_test.rb',        read_file('scaffold/tests/model.rb')
     assert_file 'test/fixtures/foos.yml',         read_file('scaffold/tests/fixture')
-    
+
     assert_file 'app/controllers/admin/foos_controller.rb',       read_file('scaffold/controller.rb')
     assert_file 'test/controllers/admin/foos_controller_test.rb', read_file('scaffold/tests/controller.rb')
-    
+
     assert_file 'app/views/admin/foos/index.html.haml', read_file('scaffold/views/index.haml')
     assert_file 'app/views/admin/foos/show.html.haml',  read_file('scaffold/views/show.haml')
     assert_file 'app/views/admin/foos/new.html.haml',   read_file('scaffold/views/new.haml')
     assert_file 'app/views/admin/foos/edit.html.haml',  read_file('scaffold/views/edit.haml')
     assert_file 'app/views/admin/foos/_form.html.haml', read_file('scaffold/views/_form.haml')
-    
+
     assert_file 'config/routes.rb', read_file('scaffold/routes.rb')
-    
+
     assert_file 'app/views/comfy/admin/cms/partials/_navigation_inner.html.haml' do |file|
       assert_match "%li= active_link_to 'Foos', admin_foos_path", file
     end
   end
-  
 end

data/test/integration/access_control_test.rb

@@ -0,0 +1,141 @@
+require_relative '../test_helper'
+
+class AccessControlTest < ActionDispatch::IntegrationTest
+
+  module TestAuthentication
+    module Authenticate
+      def authenticate
+        render :text => 'Test Login Denied', :status => :unauthorized
+      end
+    end
+
+    # faking ComfortableMexicanSofa.config.admin_auth = 'AccessControlTest::TestAuthentication'
+    # faking ComfortableMexicanSofa.config.public_auth = 'AccessControlTest::TestAuthentication'
+    class SitesController   < Comfy::Admin::Cms::SitesController; include Authenticate; end
+    class ContentController < Comfy::Cms::ContentController;      include Authenticate; end
+  end
+
+  module TestAuthorization
+    module Authorize
+      def authorize
+        @authorization_vars = self.instance_variables
+        render :text => 'Test Access Denied', :status => :forbidden
+      end
+    end
+
+    # faking ComfortableMexicanSofa.config.admin_authorization = 'AccessControlTest::TestAuthorization'
+    class SitesController       < Comfy::Admin::Cms::SitesController;       include Authorize; end
+    class LayoutsController     < Comfy::Admin::Cms::LayoutsController;     include Authorize; end
+    class PagesController       < Comfy::Admin::Cms::PagesController;       include Authorize; end
+    class SnippetsController    < Comfy::Admin::Cms::SnippetsController;    include Authorize; end
+    class FilesController       < Comfy::Admin::Cms::FilesController;       include Authorize; end
+    class CategoriesController  < Comfy::Admin::Cms::CategoriesController;  include Authorize; end
+    class RevisionsController   < Comfy::Admin::Cms::RevisionsController;   include Authorize; end
+  end
+
+
+  def test_admin_authentication_default
+    assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthentication',
+      ComfortableMexicanSofa.config.admin_auth
+
+    get '/admin/sites'
+    assert_response :unauthorized
+
+    http_auth :get, '/admin/sites'
+    assert_response :success
+  end
+
+  def test_admin_authentication_custom
+    with_routing do |routes|
+      routes.draw do
+        get '/admin/sites' => 'access_control_test/test_authentication/sites#index'
+      end
+
+      get '/admin/sites'
+      assert_response :unauthorized
+      assert_equal 'Test Login Denied', response.body
+    end
+  end
+
+  def test_admin_authorization_default
+    assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthorization',
+      ComfortableMexicanSofa.config.admin_authorization
+
+    Comfy::Admin::Cms::BaseController.send(:include, ComfortableMexicanSofa::AccessControl::AdminAuthorization)
+    http_auth :get, "/admin/sites/#{comfy_cms_sites(:default).to_param}/edit"
+    assert_response :success, response.body
+  end
+
+  def test_admin_authorization_custom
+    site = comfy_cms_sites(:default)
+    with_routing do |routes|
+      routes.draw do
+        s   = '/admin/sites'
+        ns  = 'access_control_test/test_authorization'
+        get "#{s}/:id/edit"                                   => "#{ns}/sites#edit"
+        get "#{s}/:site_id/layouts/:id/edit"                  => "#{ns}/layouts#edit"
+        get "#{s}/:site_id/layouts/:layout_id/revisions/:id"  => "#{ns}/revisions#show"
+        get "#{s}/:site_id/pages/:id/edit"                    => "#{ns}/pages#edit"
+        get "#{s}/:site_id/snippets/:id/edit"                 => "#{ns}/snippets#edit"
+        get "#{s}/:site_id/files/:id/edit"                    => "#{ns}/files#edit"
+        get "#{s}/:site_id/categories/:id/edit"               => "#{ns}/categories#edit"
+      end
+
+      http_auth :get, "/admin/sites/#{site.id}/edit"
+      assert_response :forbidden
+      assert_equal 'Test Access Denied', response.body
+      assert assigns(:authorization_vars)
+      assert assigns(:authorization_vars).member?(:@site)
+
+      layout = comfy_cms_layouts(:default)
+      http_auth :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@layout)
+
+      revision = comfy_cms_revisions(:layout)
+      http_auth :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/revisions/#{revision.id}"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@record)
+
+      page = comfy_cms_pages(:default)
+      http_auth :get, "/admin/sites/#{site.id}/pages/#{page.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@page)
+
+      snippet = comfy_cms_snippets(:default)
+      http_auth :get, "/admin/sites/#{site.id}/snippets/#{snippet.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@snippet)
+
+      file = comfy_cms_files(:default)
+      http_auth :get, "/admin/sites/#{site.id}/files/#{file.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@file)
+
+      category = comfy_cms_categories(:default)
+      http_auth :get, "/admin/sites/#{site.id}/categories/#{category.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@category)
+    end
+  end
+
+  def test_public_authentication_default
+    assert_equal 'ComfortableMexicanSofa::AccessControl::PublicAuthentication',
+      ComfortableMexicanSofa.config.public_auth
+
+    get '/'
+    assert_response :success, response.body
+  end
+
+  def test_public_authentication_custom
+    with_routing do |routes|
+      routes.draw do
+        get '/:format' => 'access_control_test/test_authentication/content#show', :path => "(*cms_path)"
+      end
+
+      get '/'
+      assert_response :unauthorized
+      assert_equal 'Test Login Denied', response.body
+    end
+  end
+end

data/test/integration/routing_test.rb

@@ -0,0 +1,19 @@
+require_relative '../test_helper'
+
+class RoutingIntergrationTest < ActionDispatch::IntegrationTest
+  
+  def teardown
+    Rails.application.reload_routes!
+  end
+
+  def test_cms_public_prefix
+    
+    assert_equal nil, ComfortableMexicanSofa.config.public_cms_path
+    
+    Rails.application.routes.draw do
+      comfy_route :cms, :path => '/custom'
+    end
+    
+    assert_equal '/custom', ComfortableMexicanSofa.config.public_cms_path
+  end
+end

data/test/lib/configuration_test.rb

@@ -3,18 +3,19 @@
 require_relative '../test_helper'
 
 class ConfigurationTest < ActiveSupport::TestCase
-  
+
   def test_configuration_presence
     assert config = ComfortableMexicanSofa.configuration
     assert_equal 'ComfortableMexicanSofa CMS Engine', config.cms_title
     assert_equal 'ApplicationController', config.base_controller
-    assert_equal 'ComfortableMexicanSofa::HttpAuth', config.admin_auth
-    assert_equal 'ComfortableMexicanSofa::DummyAuth', config.public_auth
+    assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthentication',  config.admin_auth
+    assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthorization',   config.admin_authorization
+    assert_equal 'ComfortableMexicanSofa::AccessControl::PublicAuthentication', config.public_auth
     assert_equal '', config.admin_route_redirect
     assert_equal false, config.enable_fixtures
     assert_equal File.expand_path('db/cms_fixtures', Rails.root), config.fixtures_path
     assert_equal 25, config.revisions_limit
-    assert_equal ({ 
+    assert_equal ({
       'en'    => 'English',
       'es'    => 'Español'
     }), config.locales
@@ -26,14 +27,14 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal nil, config.allowed_partials
     assert_equal nil, config.hostname_aliases
   end
-  
+
   def test_initialization_overrides
     ComfortableMexicanSofa.configuration.cms_title = 'New Title'
     assert_equal 'New Title', ComfortableMexicanSofa.configuration.cms_title
   end
-  
+
   def test_version
     assert ComfortableMexicanSofa::VERSION
   end
-  
+
 end

data/test/lib/fixtures/categories_test.rb

@@ -5,6 +5,7 @@ require_relative '../../test_helper'
 class FixtureCategoriesTest < ActiveSupport::TestCase
   
   def test_creation
+    Comfy::Cms::Category.destroy_all
     assert_difference 'Comfy::Cms::Category.count', 3 do
       ComfortableMexicanSofa::Fixture::Category::Importer.new('sample-site', 'default-site').import!
       assert Comfy::Cms::Category.where(:label => 'File Category', :categorized_type => 'Comfy::Cms::File').present?

data/test/lib/fixtures/files_test.rb

@@ -7,6 +7,11 @@ class FixtureFilesTest < ActiveSupport::TestCase
   def test_creation
     Comfy::Cms::File.delete_all
     
+    # need to have categories present before linking
+    site = comfy_cms_sites(:default)
+    site.categories.create!(:categorized_type => 'Comfy::Cms::File', :label => 'category_a')
+    site.categories.create!(:categorized_type => 'Comfy::Cms::File', :label => 'category_b')
+    
     assert_difference 'Comfy::Cms::File.count' do
       ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
       assert file = Comfy::Cms::File.last

data/test/lib/fixtures/pages_test.rb

@@ -7,12 +7,17 @@ class FixturePagesTest < ActiveSupport::TestCase
   def test_creation
     Comfy::Cms::Page.delete_all
     
-    layout = comfy_cms_layouts(:default)
+    site    = comfy_cms_sites(:default)
+    layout  = comfy_cms_layouts(:default)
     layout.update_column(:content, '<html>{{cms:page:content}}</html>')
     
     nested = comfy_cms_layouts(:nested)
     nested.update_column(:content, '<html>{{cms:page:left}}<br/>{{cms:page:right}}</html>')
     
+    # need to have categories present before linking
+    site.categories.create!(:categorized_type => 'Comfy::Cms::Page', :label => 'category_a')
+    site.categories.create!(:categorized_type => 'Comfy::Cms::Page', :label => 'category_b')
+    
     assert_difference 'Comfy::Cms::Page.count', 2 do
       ComfortableMexicanSofa::Fixture::Page::Importer.new('sample-site', 'default-site').import!
       
@@ -22,6 +27,7 @@ class FixturePagesTest < ActiveSupport::TestCase
       assert_equal "<html>Home Page Fixture Contént\ndefault_snippet_content</html>", page.content_cache
       assert_equal 0, page.position
       assert page.is_published?
+      
       assert_equal 2, page.categories.count
       assert_equal ['category_a', 'category_b'], page.categories.map{|c| c.label}
       
@@ -36,6 +42,16 @@ class FixturePagesTest < ActiveSupport::TestCase
     end
   end
   
+  def test_creation_with_missing_categories
+    Comfy::Cms::Page.delete_all
+    
+    assert_difference 'Comfy::Cms::Page.count', 2 do
+      ComfortableMexicanSofa::Fixture::Page::Importer.new('sample-site', 'default-site').import!
+      assert page = Comfy::Cms::Page.where(:full_path => '/').first
+      assert_equal 0, page.categories.count
+    end
+  end
+  
   def test_update
     page = comfy_cms_pages(:default)
     page.update_column(:updated_at, 10.years.ago)

data/test/lib/fixtures/snippets_test.rb

@@ -7,6 +7,11 @@ class FixtureSnippetsTest < ActiveSupport::TestCase
   def test_creation
     Comfy::Cms::Snippet.delete_all
     
+    # need to have categories present before linking
+    site = comfy_cms_sites(:default)
+    site.categories.create!(:categorized_type => 'Comfy::Cms::Snippet', :label => 'category_a')
+    site.categories.create!(:categorized_type => 'Comfy::Cms::Snippet', :label => 'category_b')
+    
     assert_difference 'Comfy::Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
       assert snippet = Comfy::Cms::Snippet.last

data/test/models/page_test.rb

@@ -237,6 +237,12 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal '//test.host/en/site/', comfy_cms_pages(:default).url
     assert_equal '//test.host/en/site/child-page', comfy_cms_pages(:child).url
   end
+  
+  def test_url_with_public_cms_path
+    ComfortableMexicanSofa.config.public_cms_path = '/custom'
+    assert_equal '//test.host/custom/', comfy_cms_pages(:default).url
+    assert_equal '//test.host/custom/child-page', comfy_cms_pages(:child).url
+  end
 
   def test_unicode_slug_escaping
     page = comfy_cms_pages(:child)

data/test/models/site_test.rb

@@ -149,4 +149,13 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal site_b, Comfy::Cms::Site.find_site('alias_c.host')
   end
   
+  def test_url
+    assert_equal '//test.host/', comfy_cms_sites(:default).url
+  end
+  
+  def test_url_with_public_cms_path
+    ComfortableMexicanSofa.config.public_cms_path = '/custom'
+    assert_equal '//test.host/custom/', comfy_cms_sites(:default).url
+  end
+  
 end

data/test/test_helper.rb

@@ -16,24 +16,25 @@ Paperclip::Attachment.default_options[:use_timestamp] = false
 class ActiveSupport::TestCase
   fixtures :all
   include ActionDispatch::TestProcess
-  
+
   def setup
     reset_config
     reset_locale
     stub_paperclip
   end
-  
+
   # resetting default configuration
   def reset_config
     ComfortableMexicanSofa.configure do |config|
       config.cms_title            = 'ComfortableMexicanSofa CMS Engine'
-      config.admin_auth           = 'ComfortableMexicanSofa::HttpAuth'
-      config.public_auth          = 'ComfortableMexicanSofa::DummyAuth'
+      config.admin_auth           = 'ComfortableMexicanSofa::AccessControl::AdminAuthentication'
+      config.admin_authorization  = 'ComfortableMexicanSofa::AccessControl::AdminAuthorization'
+      config.public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
       config.admin_route_redirect = ''
       config.enable_fixtures      = false
       config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
       config.revisions_limit      = 25
-      config.locales              = { 
+      config.locales              = {
         'en' => 'English',
         'es' => 'Español'
       }
@@ -44,16 +45,17 @@ class ActiveSupport::TestCase
       config.allowed_helpers      = nil
       config.allowed_partials     = nil
       config.hostname_aliases     = nil
+      config.public_cms_path      = nil
     end
-    ComfortableMexicanSofa::HttpAuth.username = 'username'
-    ComfortableMexicanSofa::HttpAuth.password = 'password'
+    ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'username'
+    ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'password'
   end
-  
+
   def reset_locale
     I18n.default_locale = :en
     I18n.locale         = :en
   end
-  
+
   # Example usage:
   #   assert_has_errors_on @record, :field_1, :field_2
   def assert_has_errors_on(record, *fields)
@@ -62,7 +64,7 @@ class ActiveSupport::TestCase
     unmatched = fields.flatten - record.errors.keys
     assert unmatched.blank?, "#{record.class} doesn't have errors on '#{unmatched.join(', ')}'"
   end
-  
+
   # Example usage:
   #   assert_exception_raised                                 do ... end
   #   assert_exception_raised ActiveRecord::RecordInvalid     do ... end
@@ -92,13 +94,13 @@ class ActiveSupport::TestCase
   def rendered_content_formatter(string)
     string.gsub(/^[ ]+/, '')
   end
-  
+
   def stub_paperclip
     Comfy::Cms::Block.any_instance.stubs(:save_attached_files).returns(true)
     Comfy::Cms::Block.any_instance.stubs(:delete_attached_files).returns(true)
     Paperclip::Attachment.any_instance.stubs(:post_process).returns(true)
   end
-  
+
 end
 
 class ActionController::TestCase
@@ -108,28 +110,35 @@ class ActionController::TestCase
 end
 
 class ActionDispatch::IntegrationTest
-  
+
   def setup
     host! 'test.host'
     reset_config
     reset_locale
     stub_paperclip
   end
-  
+
   # Attaching http_auth stuff with request. Example use:
   #   http_auth :get, '/cms-admin/pages'
   def http_auth(method, path, options = {}, username = 'username', password = 'password')
     send(method, path, options, {'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64(username + ':' + password)}"})
   end
+
+  # Overriding helper method as it doesn't really work for integration tests by default
+  def with_routing(&block)
+    yield ComfortableMexicanSofa::Application.routes
+  ensure
+    load File.expand_path('../config/cms_routes.rb', File.dirname(__FILE__))
+  end
 end
 
 class Rails::Generators::TestCase
-  
+
   destination File.expand_path('../tmp', File.dirname(__FILE__))
-  
+
   setup :prepare_destination,
         :prepare_files
-  
+
   def prepare_files
     config_path = File.join(self.destination_root, 'config')
     routes_path = File.join(config_path, 'routes.rb')
@@ -139,7 +148,7 @@ class Rails::Generators::TestCase
       f.write("Test::Application.routes.draw do\n\nend")
     end
   end
-  
+
   def read_file(filename)
     File.read(
       File.join(
@@ -148,5 +157,5 @@ class Rails::Generators::TestCase
       )
     )
   end
-  
+
 end