comfy_blog 2.0.2 → 2.0.3

data/test/controllers/comfy/admin/blog/posts_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../test_helper'
+require_relative "../../../../test_helper"
 
 class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
 
@@ -24,12 +24,12 @@ class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
 
   def test_get_index_with_category
     category = @site.categories.create!(
-      label:            'Test Category',
-      categorized_type: 'Comfy::Blog::Post'
+      label:            "Test Category",
+      categorized_type: "Comfy::Blog::Post"
     )
     category.categorizations.create!(categorized: @post)
 
-    r :get, comfy_admin_blog_posts_path(@site), params: {categories: category.label}
+    r :get, comfy_admin_blog_posts_path(@site), params: { categories: category.label }
     assert_response :success
     assert assigns(:posts)
     assert_equal 1, assigns(:posts).count
@@ -37,7 +37,7 @@ class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_get_index_with_category_invalid
-    r :get, comfy_admin_blog_posts_path(@site), params: {categories: 'invalid'}
+    r :get, comfy_admin_blog_posts_path(@site), params: { categories: "invalid" }
     assert_response :success
     assert assigns(:posts)
     assert_equal 0, assigns(:posts).count
@@ -52,33 +52,33 @@ class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_creation
-    post_count = -> {Comfy::Blog::Post.count}
-    frag_count = -> {Comfy::Cms::Fragment.count}
+    post_count = -> { Comfy::Blog::Post.count }
+    frag_count = -> { Comfy::Cms::Fragment.count }
     assert_difference [post_count, frag_count] do
-      r :post, comfy_admin_blog_posts_path(@site), params: {post: {
-        title:        'Test Post',
-        slug:         'test-post',
+      r :post, comfy_admin_blog_posts_path(@site), params: { post: {
+        title:        "Test Post",
+        slug:         "test-post",
         published_at: 2.days.ago.to_s(:db),
-        is_published: '1',
+        is_published: "1",
         layout_id:    @layout,
         fragments_attributes: [
-          { identifier: 'content',
-            content:    'test text' }
+          { identifier: "content",
+            content:    "test text" }
         ]
-      }}
+      } }
       assert_response :redirect
       assert_redirected_to action: :edit, id: assigns(:post)
-      assert_equal 'Blog Post created', flash[:success]
+      assert_equal "Blog Post created", flash[:success]
     end
   end
 
   def test_creation_failure
-    assert_no_difference ->{Comfy::Blog::Post.count} do
-      r :post, comfy_admin_blog_posts_path(@site), params: {post: {}}
+    assert_no_difference -> { Comfy::Blog::Post.count } do
+      r :post, comfy_admin_blog_posts_path(@site), params: { post: {} }
       assert_response :success
       assert_template :new
       assert assigns(:post)
-      assert_equal 'Failed to create Blog Post', flash[:danger]
+      assert_equal "Failed to create Blog Post", flash[:danger]
     end
   end
 
@@ -91,42 +91,63 @@ class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_get_edit_failure
-    r :get, edit_comfy_admin_blog_post_path(@site, 'invalid')
+    r :get, edit_comfy_admin_blog_post_path(@site, "invalid")
     assert_response :redirect
     assert_redirected_to action: :index
-    assert_equal 'Blog Post not found', flash[:danger]
+    assert_equal "Blog Post not found", flash[:danger]
   end
 
   def test_update
-    r :put, comfy_admin_blog_post_path(@site, @post), params: {post: {
-      title: 'Updated Post'
-    }}
+    r :put, comfy_admin_blog_post_path(@site, @post), params: { post: {
+      title: "Updated Post"
+    } }
     assert_response :redirect
     assert_redirected_to action: :edit, id: assigns(:post)
-    assert_equal 'Blog Post updated', flash[:success]
+    assert_equal "Blog Post updated", flash[:success]
 
     @post.reload
-    assert_equal 'Updated Post', @post.title
+    assert_equal "Updated Post", @post.title
   end
 
   def test_update_failure
-    r :put, comfy_admin_blog_post_path(@site, @post), params: {post: {
-      title: ''
-    }}
+    r :put, comfy_admin_blog_post_path(@site, @post), params: { post: {
+      title: ""
+    } }
     assert_response :success
     assert_template :edit
-    assert_equal 'Failed to update Blog Post', flash[:danger]
+    assert_equal "Failed to update Blog Post", flash[:danger]
 
     @post.reload
-    assert_not_equal '', @post.title
+    assert_not_equal "", @post.title
   end
 
   def test_destroy
-    assert_difference -> {Comfy::Blog::Post.count}, -1 do
+    assert_difference -> { Comfy::Blog::Post.count }, -1 do
       r :delete, comfy_admin_blog_post_path(@site, @post)
       assert_response :redirect
       assert_redirected_to action: :index
-      assert_equal 'Blog Post removed', flash[:success]
+      assert_equal "Blog Post removed", flash[:success]
     end
   end
+
+  def test_get_form_fragments
+    r :get, form_fragments_comfy_admin_blog_post_path(site_id: @site, id: @post), xhr: true, params: {
+      layout_id: @layout.id
+    }
+    assert_response :success
+    assert assigns(:post)
+    assert_equal 1, assigns(:post).fragment_nodes.size
+    assert_template :form_fragments
+  end
+
+  def test_get_form_fragments_for_new_post
+    r :get, form_fragments_comfy_admin_blog_post_path(site_id: @site, id: 0), xhr: true, params: {
+      layout_id: @layout.id
+    }
+    assert_response :success
+    assert assigns(:post)
+    assert_equal 1, assigns(:post).fragment_nodes.size
+    assert_template :form_fragments
+  end
+
 end

data/test/controllers/comfy/admin/blog/revisions/post_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../../test_helper'
+require_relative "../../../../../test_helper"
 
 class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::IntegrationTest
 
@@ -34,24 +34,23 @@ class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::Integra
     r :get, comfy_admin_blog_post_revision_path(@site, "invalid", @revision)
     assert_response :redirect
     assert_redirected_to comfy_admin_blog_posts_path(@site)
-    assert_equal 'Record Not Found', flash[:danger]
+    assert_equal "Record Not Found", flash[:danger]
   end
 
-
   def test_get_show_failure
     r :get, comfy_admin_blog_post_revision_path(@site, @post, "invalid")
     assert_response :redirect
     assert assigns(:record)
     assert_redirected_to edit_comfy_admin_blog_post_path(@site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:danger]
+    assert_equal "Revision Not Found", flash[:danger]
   end
 
   def test_revert
-    assert_difference -> {@post.revisions.count} do
+    assert_difference -> { @post.revisions.count } do
       r :patch, revert_comfy_admin_blog_post_revision_path(@site, @post, @revision)
       assert_response :redirect
       assert_redirected_to edit_comfy_admin_blog_post_path(@site, @post)
-      assert_equal 'Content Reverted', flash[:success]
+      assert_equal "Content Reverted", flash[:success]
 
       @post.reload
 
@@ -64,4 +63,5 @@ class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::Integra
       }], @post.fragments_attributes
     end
   end
+
 end

data/test/controllers/comfy/blog/posts_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../test_helper'
+require_relative "../../../test_helper"
 
 class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
 
@@ -16,7 +16,7 @@ class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_get_index_as_rss
-    get comfy_blog_posts_path, params: {format: :rss}
+    get comfy_blog_posts_path, params: { format: :rss }
     assert_response :success
     assert_template :index
     assert assigns(:blog_posts)
@@ -52,12 +52,12 @@ class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
 
   def test_get_index_with_category
     category = @site.categories.create!(
-      label:            'Test Category',
-      categorized_type: 'Comfy::Blog::Post'
+      label:            "Test Category",
+      categorized_type: "Comfy::Blog::Post"
     )
     category.categorizations.create!(categorized: @post)
 
-    get comfy_blog_posts_path, params: {category: category.label}
+    get comfy_blog_posts_path, params: { category: category.label }
 
     assert_response :success
     assert assigns(:blog_posts)
@@ -66,7 +66,7 @@ class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_get_index_with_category_invalid
-    get comfy_blog_posts_path, params: {category: 'invalid'}
+    get comfy_blog_posts_path, params: { category: "invalid" }
     assert_response :success
     assert assigns(:blog_posts)
     assert_equal 0, assigns(:blog_posts).count
@@ -91,4 +91,5 @@ class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
       get comfy_blog_post_path(@site.path, 1234, 99, @post.slug)
     end
   end
+
 end

data/test/gemfiles/Gemfile.rails.5.2

@@ -5,8 +5,9 @@ gemspec path: "../../"
 gem 'kaminari', '>= 0.14.0'
 
 group :test do
-  gem 'sqlite3'
-  gem 'coveralls',  require: false
-  gem 'mocha',      require: false
-  gem 'rails-controller-testing'
+  gem "rubocop", "~> 0.51.0", require: false
+  gem "sqlite3"
+  gem "coveralls",  require: false
+  gem "mocha",      require: false
+  gem "rails-controller-testing"
 end

data/test/generators/blog_generator_test.rb

@@ -1,19 +1,20 @@
-require_relative '../test_helper'
-require_relative '../../lib/generators/comfy/blog/blog_generator'
+require_relative "../test_helper"
+require_relative "../../lib/generators/comfy/blog/blog_generator"
 
 class CmsGeneratorTest < Rails::Generators::TestCase
+
   tests Comfy::Generators::BlogGenerator
 
   def test_generator
     run_generator
 
-    assert_migration 'db/migrate/create_blog.rb'
+    assert_migration "db/migrate/create_blog.rb"
 
-    assert_file 'config/initializers/comfy_blog.rb'
+    assert_file "config/initializers/comfy_blog.rb"
 
-    assert_file 'config/routes.rb', read_file('blog/routes.rb')
+    assert_file "config/routes.rb", read_file("blog/routes.rb")
 
-    assert_directory 'app/views/comfy/blog'
+    assert_directory "app/views/comfy/blog"
   end
 
 end

data/test/integration/i18n_test.rb

@@ -1,30 +1,30 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class I18nIntegrationTest < ActionDispatch::IntegrationTest
 
   def collect_combined_keys(hash, ns = nil)
     hash.collect do |k, v|
-      keys = [ ]
+      keys = []
       keys << collect_combined_keys(v, "#{ns}.#{k}") if v.is_a?(Hash)
       keys << "#{ns}.#{k}"
     end.flatten
   end
 
   def test_translations
-    locales_path = File.expand_path('../../../config/locales', __FILE__)
+    locales_path = File.expand_path("../../../config/locales", __FILE__)
     locales = Dir.glob("#{locales_path}/*.yml").collect do |file_path|
-      File.basename(file_path, '.yml')
+      File.basename(file_path, ".yml")
     end
 
     # collecting all locales
-    locale_keys = { }
+    locale_keys = {}
     locales.each do |locale|
       translations = YAML.load_file("#{locales_path}/#{locale}.yml")
       locale_keys[locale] = collect_combined_keys(translations[locale])
     end
 
     # Using en as reference
-    reference = locale_keys[locales.delete('en')]
+    reference = locale_keys[locales.delete("en")]
     assert reference.present?
 
     locale_keys.each do |locale, keys|
@@ -34,4 +34,5 @@ class I18nIntegrationTest < ActionDispatch::IntegrationTest
       assert extra.blank?, "#{locale} locale has extra: #{extra.join(', ')}"
     end
   end
-end
+
+end

data/test/lib/configuration_test.rb

@@ -1,16 +1,17 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class ConfigurationTest < ActiveSupport::TestCase
 
   def test_configuration
     assert config = ComfyBlog.configuration
     assert_equal  10,                       config.posts_per_page
-    assert_equal 'comfy/blog/application',  config.app_layout
-    assert_equal 'blog',                    config.public_blog_path
+    assert_equal "comfy/blog/application",  config.app_layout
+    assert_equal "blog",                    config.public_blog_path
   end
 
   def test_initialization_overrides
     ComfyBlog.config.posts_per_page = 5
     assert_equal 5, ComfyBlog.config.posts_per_page
   end
+
 end

data/test/models/posts_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class BlogPostsTest < ActiveSupport::TestCase
 
@@ -35,29 +35,29 @@ class BlogPostsTest < ActiveSupport::TestCase
 
   def test_validation_of_slug_format
     post = @site.blog_posts.new(
-      title: 'Test Title',
-      slug:  'test%slug',
+      title: "Test Title",
+      slug:  "test%slug",
       layout: @layout
     )
     assert post.valid?
   end
 
   def test_creation
-    assert_difference -> {Comfy::Blog::Post.count} do
+    assert_difference -> { Comfy::Blog::Post.count } do
       post = @site.blog_posts.create!(
-        title: 'Test Post',
+        title: "Test Post",
         layout: @layout
       )
-      assert_equal 'test-post',           post.slug
+      assert_equal "test-post",           post.slug
       assert_equal Time.zone.now.year,    post.year
       assert_equal Time.zone.now.month,   post.month
     end
   end
 
   def test_set_slug
-    post = Comfy::Blog::Post.new(title: 'Test Title')
+    post = Comfy::Blog::Post.new(title: "Test Title")
     post.send(:set_slug)
-    assert_equal 'test-title', post.slug
+    assert_equal "test-title", post.slug
   end
 
   def test_set_date
@@ -93,10 +93,11 @@ class BlogPostsTest < ActiveSupport::TestCase
   end
 
   def test_url
-    assert_equal '//test.host/blog/2012/1/default-title', @post.url
-    assert_equal '/blog/2012/1/default-title', @post.url(relative: true)
+    assert_equal "//test.host/blog/2012/1/default-title", @post.url
+    assert_equal "/blog/2012/1/default-title", @post.url(relative: true)
 
     ComfyBlog.config.public_blog_path = "test-blog"
-    assert_equal '//test.host/test-blog/2012/1/default-title', @post.url
+    assert_equal "//test.host/test-blog/2012/1/default-title", @post.url
   end
+
 end

data/test/test_helper.rb

@@ -1,16 +1,16 @@
-ENV['RAILS_ENV'] = 'test'
+ENV["RAILS_ENV"] = "test"
 
-require 'simplecov'
-require 'coveralls'
+require "simplecov"
+require "coveralls"
 SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start do
-  add_filter 'lib/generators'
-  add_filter 'lib/comfy_blog/engine.rb '
+  add_filter "lib/generators"
+  add_filter "lib/comfy_blog/engine.rb "
 end
-require_relative '../config/environment'
+require_relative "../config/environment"
 
-require 'rails/test_help'
-require 'rails/generators'
+require "rails/test_help"
+require "rails/generators"
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -23,8 +23,8 @@ class ActiveSupport::TestCase
   def reset_config
     ComfyBlog.configure do |config|
       config.posts_per_page   = 10
-      config.app_layout       = 'comfy/blog/application'
-      config.public_blog_path = 'blog'
+      config.app_layout       = "comfy/blog/application"
+      config.public_blog_path = "blog"
     end
   end
 
@@ -41,10 +41,11 @@ class ActiveSupport::TestCase
   #   assert_exception_raised                                 do ... end
   #   assert_exception_raised ActiveRecord::RecordInvalid     do ... end
   #   assert_exception_raised Plugin::Error, 'error_message'  do ... end
-  def assert_exception_raised(exception_class = nil, error_message = nil, &block)
+  def assert_exception_raised(exception_class = nil, error_message = nil)
     exception_raised = nil
     yield
-  rescue => exception_raised
+  rescue StandardError => exception_raised
+    exception_raised
   ensure
     if exception_raised
       if exception_class
@@ -54,7 +55,7 @@ class ActiveSupport::TestCase
       end
       assert_equal error_message, exception_raised.to_s if error_message
     else
-      flunk 'Exception was not raised'
+      flunk "Exception was not raised"
     end
   end
 
@@ -65,35 +66,36 @@ class ActionDispatch::IntegrationTest
   setup :setup_host
 
   def setup_host
-    host! 'test.host'
+    host! "test.host"
   end
 
   # Attaching http_auth stuff with request. Example use:
   #   r :get, '/cms-admin/pages'
   def r(method, path, options = {})
     headers = options[:headers] || {}
-    headers['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(
+    headers["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(
       ComfortableMexicanSofa::AccessControl::AdminAuthentication.username,
       ComfortableMexicanSofa::AccessControl::AdminAuthentication.password
     )
-    options.merge!(headers: headers)
+    options[:headers] = headers
     send(method, path, options)
   end
+
 end
 
 class Rails::Generators::TestCase
 
-  destination File.expand_path('../tmp', File.dirname(__FILE__))
+  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')
+    config_path = File.join(destination_root, "config")
+    routes_path = File.join(config_path, "routes.rb")
     FileUtils.mkdir_p(config_path)
     FileUtils.touch(routes_path)
-    File.open(routes_path, 'w') do |f|
+    File.open(routes_path, "w") do |f|
       f.write("Test::Application.routes.draw do\n\nend")
     end
   end
@@ -101,9 +103,10 @@ class Rails::Generators::TestCase
   def read_file(filename)
     File.read(
       File.join(
-        File.expand_path('fixtures/generators', File.dirname(__FILE__)),
+        File.expand_path("fixtures/generators", File.dirname(__FILE__)),
         filename
       )
     )
   end
+
 end