comfortable_mexican_sofa 1.12.2 → 1.12.3

data/test/controllers/comfy/admin/cms/pages_controller_test.rb

@@ -8,35 +8,35 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert assigns(:pages)
     assert_template :index
   end
-  
+
   def test_get_index_with_no_pages
     Comfy::Cms::Page.delete_all
     get :index, :site_id => comfy_cms_sites(:default)
     assert_response :redirect
     assert_redirected_to :action => :new
   end
-  
+
   def test_get_index_with_category
     category = comfy_cms_sites(:default).categories.create!(
       :label            => 'Test Category',
       :categorized_type => 'Comfy::Cms::Page'
     )
     category.categorizations.create!(:categorized => comfy_cms_pages(:child))
-    
+
     get :index, :site_id => comfy_cms_sites(:default), :category => category.label
     assert_response :success
     assert assigns(:pages)
     assert_equal 1, assigns(:pages).count
     assert assigns(:pages).first.categories.member? category
   end
-  
+
   def test_get_index_with_category_invalid
     get :index, :site_id => comfy_cms_sites(:default), :category => 'invalid'
     assert_response :success
     assert assigns(:pages)
     assert_equal 0, assigns(:pages).count
   end
-  
+
   def test_get_index_with_toggle
     comfy_cms_sites(:default).pages.create!(
       :label  => 'test',
@@ -47,7 +47,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     get :index, :site_id => comfy_cms_sites(:default)
     assert_response :success
   end
-  
+
   def test_get_new
     site = comfy_cms_sites(:default)
     get :new, :site_id => site
@@ -57,7 +57,6 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_template :new
     assert_select "form[action=/admin/sites/#{site.id}/pages]"
     assert_select "select[data-url=/admin/sites/#{site.id}/pages/0/form_blocks]"
-    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_new_with_field_datetime
@@ -91,7 +90,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode='text/html']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_field_rich_text
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:rich_text}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -131,7 +130,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode=text/html]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_page_file
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:page_file:test_label}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -139,7 +138,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_page_files
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:page_files:test_label}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -147,7 +146,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_collection
     snippet = comfy_cms_snippets(:default)
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:collection:snippet:comfy/cms/snippet}}')
@@ -167,7 +166,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-rich-text]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_page_markdown
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:markdown}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -175,7 +174,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode=text/x-markdown]"
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
-  
+
   def test_get_new_with_boolean_field
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:boolean}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -184,7 +183,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][content]'][value='']"
     assert_select "input[type='checkbox'][name='page[blocks_attributes][0][content]'][value='1']"
   end
-  
+
   def test_get_new_with_several_tag_fields
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:label_a}}{{cms:page:label_b}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -194,18 +193,18 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][1][content]']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='label_b']"
   end
-  
+
   def test_get_new_with_crashy_tag
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:collection:label:invalid}}')
-    assert_exception_raised do 
+    assert_exception_raised do
       get :new, :site_id => comfy_cms_sites(:default)
     end
-    
+
     Rails.stubs(:env => ActiveSupport::StringInquirer.new('production'))
     get :new, :site_id => comfy_cms_sites(:default)
     assert_response :success
   end
-  
+
   def test_get_new_with_repeated_tag
     comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label}}{{cms:page:test_label}}')
     get :new, :site_id => comfy_cms_sites(:default)
@@ -215,7 +214,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "textarea[name='page[blocks_attributes][1][content]']", 0
     assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='test_label']", 0
   end
-  
+
   def test_get_new_as_child_page
     get :new, :site_id => comfy_cms_sites(:default), :parent_id => comfy_cms_pages(:default)
     assert_response :success
@@ -249,21 +248,21 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert assigns(:page)
     assert assigns(:page).layout
   end
-  
+
   def test_get_edit_with_non_english_locale
     site = comfy_cms_sites(:default)
     site.update_columns(:locale => 'es')
     get :edit, :site_id => site, :id => comfy_cms_pages(:default)
     assert_response :success
   end
-  
+
   def test_get_edit_with_layout_and_no_tags
     page = comfy_cms_pages(:default)
     page.layout.update_column(:content, '')
     get :edit, :site_id => page.site, :id => page
     assert_response :success
   end
-  
+
   def test_creation
     assert_difference 'Comfy::Cms::Page.count' do
       assert_difference 'Comfy::Cms::Block.count', 2 do
@@ -287,7 +286,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
       end
     end
   end
-  
+
   def test_creation_failure
     assert_no_difference ['Comfy::Cms::Page.count', 'Comfy::Cms::Block.count'] do
       post :create, :site_id => comfy_cms_sites(:default), :page => {
@@ -321,7 +320,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
       assert_equal 'Updated Label', page.label
     end
   end
-  
+
   def test_update_with_layout_change
     page = comfy_cms_pages(:default)
     assert_difference 'Comfy::Cms::Block.count', 2 do
@@ -392,7 +391,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
   def test_creation_preview
     site    = comfy_cms_sites(:default)
     layout  = comfy_cms_layouts(:default)
-    
+
     assert_no_difference 'Comfy::Cms::Page.count' do
       post :create, :site_id => site, :preview => 'Preview', :page => {
         :label      => 'Test Page',
@@ -407,7 +406,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
       assert_response :success
       assert_match /preview content/, response.body
       assert_equal 'text/html', response.content_type
-      
+
       assert_equal site, assigns(:cms_site)
       assert_equal layout, assigns(:cms_layout)
       assert assigns(:cms_page)
@@ -429,7 +428,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
       assert_match /preview content/, response.body
       page.reload
       assert_not_equal 'Updated Label', page.label
-      
+
       assert_equal page.site,   assigns(:cms_site)
       assert_equal page.layout, assigns(:cms_layout)
       assert_equal page,        assigns(:cms_page)

data/test/controllers/comfy/admin/cms/snippets_controller_test.rb

@@ -15,18 +15,18 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :action => :new
   end
-  
+
   def test_get_index_with_category
     category = comfy_cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Comfy::Cms::Snippet')
     category.categorizations.create!(:categorized => comfy_cms_snippets(:default))
-    
+
     get :index, :site_id => comfy_cms_sites(:default), :category => category.label
     assert_response :success
     assert assigns(:snippets)
     assert_equal 1, assigns(:snippets).count
     assert assigns(:snippets).first.categories.member? category
   end
-  
+
   def test_get_index_with_category_invalid
     get :index, :site_id => comfy_cms_sites(:default), :category => 'invalid'
     assert_response :success
@@ -41,7 +41,6 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert assigns(:snippet)
     assert_template :new
     assert_select "form[action=/admin/sites/#{site.id}/snippets]"
-    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_edit
@@ -52,7 +51,7 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert_template :edit
     assert_select "form[action=/admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
   end
-  
+
   def test_get_edit_with_params
     snippet = comfy_cms_snippets(:default)
     get :edit, :site_id => snippet.site, :id => snippet, :snippet => {:label => 'New Label'}
@@ -67,7 +66,7 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert_redirected_to :action => :index
     assert_equal 'Snippet not found', flash[:danger]
   end
-  
+
   def test_create
     assert_difference 'Comfy::Cms::Snippet.count' do
       post :create, :site_id => comfy_cms_sites(:default), :snippet => {
@@ -126,7 +125,7 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
       assert_equal 'Snippet deleted', flash[:success]
     end
   end
-  
+
   def test_reorder
     snippet_one = comfy_cms_snippets(:default)
     snippet_two = comfy_cms_sites(:default).snippets.create!(
@@ -145,4 +144,4 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert_equal 0, snippet_two.position
   end
 
-end
+end

data/test/controllers/comfy/cms/content_controller_test.rb

@@ -25,13 +25,15 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
   def test_show_default_html
     @request.headers["Accept"] = "*/*"
     get :show, :cms_path => ''
+    assert_response :success
     assert_equal 'text/html', response.content_type
   end
-  
+
   def test_show_as_json
     get :show, :cms_path => '', :format => 'json'
     assert_response :success
-    
+    assert_equal 'application/json', response.content_type
+
     content = rendered_content_formatter(
       '
       layout_content_a
@@ -58,12 +60,36 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
     assert_equal true,            json_response['is_published']
   end
 
+  def test_show_with_custom_mimetype
+    layout = comfy_cms_sites(:default).layouts.create!(
+      :label      => 'RSS Layout',
+      :identifier => 'rss-layout',
+      :content    => '{{cms:field:mime_type}}{{cms:page:content}}',
+    )
+    page = comfy_cms_sites(:default).pages.create!(
+      :label          => 'rss',
+      :slug           => 'rss',
+      :parent_id      => comfy_cms_pages(:default).id,
+      :layout_id      => layout.id,
+      :is_published   => true,
+      :blocks_attributes => [
+        { :identifier => 'content',
+          :content    => 'content' },
+        { :identifier => 'mime_type',
+          :content    => 'application/rss+xml' }
+      ]
+    )
+    get :show, :cms_path => 'rss'
+    assert_response :success
+    assert_equal 'application/rss+xml', response.content_type
+  end
+
   def test_show_with_app_layout
     comfy_cms_layouts(:default).update_columns(:app_layout => 'comfy/admin/cms')
     get :show, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
-    assert_select "body[class='c-comfy-cms-content a-show']"
+    assert_select "body.c-comfy-cms-content.a-show"
   end
 
   def test_show_with_xhr
@@ -71,7 +97,7 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
     xhr :get, :show, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
-    assert_no_select "body[class='c_cms_content a_show']"
+    assert_no_select "body.c-comfy-cms-content.a-show"
   end
 
   def test_show_not_found

data/test/gemfiles/Gemfile.rails.4.0

@@ -13,10 +13,11 @@ gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
 gem 'tinymce-rails',    '>= 4.0.0'
-gem 'bootstrap-sass',   '~> 3.1.0'
+gem 'bootstrap-sass',   '~> 3.2.0'
+gem 'plupload-rails',   '~> 1.2.1'
 
 group :test do
   gem 'sqlite3'
   gem 'coveralls',  :require => false
   gem 'mocha',      :require => false
-end
+end

data/test/gemfiles/Gemfile.rails.4.1

@@ -13,10 +13,11 @@ gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
 gem 'tinymce-rails',    '>= 4.0.0'
-gem 'bootstrap-sass',   '~> 3.1.0'
+gem 'bootstrap-sass',   '~> 3.2.0'
+gem 'plupload-rails',   '~> 1.2.1'
 
 group :test do
   gem 'sqlite3'
   gem 'coveralls',  :require => false
   gem 'mocha',      :require => false
-end
+end

data/test/gemfiles/Gemfile.rails.master

@@ -13,10 +13,11 @@ gem 'coffee-rails',     '>= 3.1.0'
 gem 'codemirror-rails', '>= 3.0.0'
 gem 'kaminari',         '>= 0.14.0'
 gem 'tinymce-rails',    '>= 4.0.0'
-gem 'bootstrap-sass',   '~> 3.1.0'
+gem 'bootstrap-sass',   '~> 3.2.0'
+gem 'plupload-rails',   '~> 1.2.1'
 
 group :test do
   gem 'sqlite3'
   gem 'coveralls',  :require => false
   gem 'mocha',      :require => false
-end
+end

data/test/generators/cms_assets_generator_test.rb

@@ -0,0 +1,13 @@
+require_relative '../test_helper'
+require_relative '../../lib/generators/comfy/cms/assets_generator'
+
+class CmsAssetsGeneratorTest < Rails::Generators::TestCase
+  tests Comfy::Generators::Cms::AssetsGenerator
+
+  def test_generator
+    run_generator
+    assert_directory 'app/assets/images/comfortable_mexican_sofa'
+    assert_directory 'app/assets/javascripts/comfortable_mexican_sofa'
+    assert_directory 'app/assets/stylesheets/comfortable_mexican_sofa'
+  end
+end

data/test/generators/cms_controllers_generator_test.rb

@@ -0,0 +1,12 @@
+require_relative '../test_helper'
+require_relative '../../lib/generators/comfy/cms/controllers_generator'
+
+class CmsControllersGeneratorTest < Rails::Generators::TestCase
+  tests Comfy::Generators::Cms::ControllersGenerator
+
+  def test_generator
+    run_generator
+    assert_directory 'app/controllers/comfy'
+    assert_file 'app/controllers/comfy/admin/cms/base_controller.rb'
+  end
+end

data/test/generators/cms_generator_test.rb

@@ -3,21 +3,23 @@ require_relative '../../lib/generators/comfy/cms/cms_generator'
 
 class CmsGeneratorTest < Rails::Generators::TestCase
   tests Comfy::Generators::CmsGenerator
-  
+
   def test_generator
     run_generator
-    
+
     assert_migration 'db/migrate/create_cms.rb'
-    
+
     assert_file 'config/initializers/comfortable_mexican_sofa.rb'
-    
+    assert_file 'config/initializers/mime_types.rb' do |file|
+      assert_match "Mime::Type.register 'text/plupload', :plupload", file
+    end
+
     assert_file 'config/routes.rb', read_file('cms/routes.rb')
-    
+
     assert_directory 'db/cms_fixtures'
-    
+
     assert_file 'app/assets/javascripts/comfortable_mexican_sofa/admin/application.js'
-    
+
     assert_file 'app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css'
   end
-
 end

data/test/generators/cms_models_generator_test.rb

@@ -0,0 +1,12 @@
+require_relative '../test_helper'
+require_relative '../../lib/generators/comfy/cms/models_generator'
+
+class CmsModelsGeneratorTest < Rails::Generators::TestCase
+  tests Comfy::Generators::Cms::ModelsGenerator
+
+  def test_generator
+    run_generator
+    assert_directory 'app/models/comfy'
+    assert_file 'app/models/comfy/cms/page.rb'
+  end
+end