comfortable_mexican_sofa 2.0.2 → 2.0.3

data/test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../../test_helper'
+require_relative "../../../../../test_helper"
 
 class Comfy::Admin::Cms::Revisions::SnippetControllerTest < ActionDispatch::IntegrationTest
 
@@ -34,26 +34,27 @@ class Comfy::Admin::Cms::Revisions::SnippetControllerTest < ActionDispatch::Inte
     r :get, comfy_admin_cms_site_snippet_revision_path(@site, "invalid", @revision)
     assert_response :redirect
     assert_redirected_to comfy_admin_cms_site_snippets_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_cms_site_snippet_revision_path(@site, @snippet, 'invalid')
+    r :get, comfy_admin_cms_site_snippet_revision_path(@site, @snippet, "invalid")
     assert_response :redirect
     assert assigns(:record)
     assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:danger]
+    assert_equal "Revision Not Found", flash[:danger]
   end
 
-   def test_revert
-    assert_difference -> {@snippet.revisions.count} do
+  def test_revert
+    assert_difference -> { @snippet.revisions.count } do
       r :patch, revert_comfy_admin_cms_site_snippet_revision_path(@site, @snippet, @revision)
       assert_response :redirect
       assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, @snippet)
-      assert_equal 'Content Reverted', flash[:success]
+      assert_equal "Content Reverted", flash[:success]
 
       @snippet.reload
-      assert_equal 'revision content', @snippet.content
+      assert_equal "revision content", @snippet.content
     end
   end
+
 end

data/test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../../test_helper'
+require_relative "../../../../../test_helper"
 
 class Comfy::Admin::Cms::Revisions::TranslationControllerTest < ActionDispatch::IntegrationTest
 
@@ -35,24 +35,23 @@ class Comfy::Admin::Cms::Revisions::TranslationControllerTest < ActionDispatch::
     r :get, comfy_admin_cms_site_page_translation_revision_path(@site, @page, "invalid", @revision)
     assert_response :redirect
     assert_redirected_to comfy_admin_cms_site_pages_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_cms_site_page_translation_revision_path(@site, @page, @translation, 'invalid')
+    r :get, comfy_admin_cms_site_page_translation_revision_path(@site, @page, @translation, "invalid")
     assert_response :redirect
     assert assigns(:record)
     assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:danger]
+    assert_equal "Revision Not Found", flash[:danger]
   end
 
   def test_revert
-    assert_difference -> {@translation.revisions.count} do
+    assert_difference -> { @translation.revisions.count } do
       r :patch, revert_comfy_admin_cms_site_page_translation_revision_path(@site, @page, @translation, @revision)
       assert_response :redirect
       assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
-      assert_equal 'Content Reverted', flash[:success]
+      assert_equal "Content Reverted", flash[:success]
 
       @translation.reload
 

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

@@ -1,4 +1,4 @@
-require_relative '../../../../test_helper'
+require_relative "../../../../test_helper"
 
 class Comfy::Admin::Cms::SitesControllerTest < ActionDispatch::IntegrationTest
 
@@ -20,7 +20,7 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionDispatch::IntegrationTest
     r :get, new_comfy_admin_cms_site_path
     assert_response :success
     assert assigns(:site)
-    assert_equal 'test.host', assigns(:site).hostname
+    assert_equal "test.host", assigns(:site).hostname
     assert_template :new
     assert_select "form[action='/admin/sites']"
   end
@@ -35,69 +35,70 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_get_edit_failure
-    r :get, edit_comfy_admin_cms_site_path(id: 'invalid')
+    r :get, edit_comfy_admin_cms_site_path(id: "invalid")
     assert_response :redirect
     assert_redirected_to action: :index
-    assert_equal 'Site not found', flash[:danger]
+    assert_equal "Site not found", flash[:danger]
   end
 
   def test_create
-    assert_difference 'Comfy::Cms::Site.count' do
-      r :post, comfy_admin_cms_sites_path, params: {site: {
-        label:      'Test Site',
-        identifier: 'test-site',
-        hostname:   'test.site.local'
-      }}
+    assert_difference "Comfy::Cms::Site.count" do
+      r :post, comfy_admin_cms_sites_path, params: { site: {
+        label:      "Test Site",
+        identifier: "test-site",
+        hostname:   "test.site.local"
+      } }
       assert_response :redirect
       site = Comfy::Cms::Site.last
       assert_redirected_to comfy_admin_cms_site_layouts_path(site_id: site)
-      assert_equal 'Site created', flash[:success]
+      assert_equal "Site created", flash[:success]
     end
   end
 
   def test_creation_failure
-    assert_no_difference 'Comfy::Cms::Site.count' do
-      r :post, comfy_admin_cms_sites_path, params: {site: {}}
+    assert_no_difference "Comfy::Cms::Site.count" do
+      r :post, comfy_admin_cms_sites_path, params: { site: {} }
       assert_response :success
       assert_template :new
-      assert_equal 'Failed to create site', flash[:danger]
+      assert_equal "Failed to create site", flash[:danger]
     end
   end
 
   def test_update
     site = comfy_cms_sites(:default)
-    r :put, comfy_admin_cms_site_path(id: site), params: {site: {
-      label:    'New Site',
-      hostname: 'new.site.local',
-      locale:   'es'
-    }}
+    r :put, comfy_admin_cms_site_path(id: site), params: { site: {
+      label:    "New Site",
+      hostname: "new.site.local",
+      locale:   "es"
+    } }
     assert_response :redirect
     assert_redirected_to action: :edit, id: site
-    assert_equal 'Site updated', flash[:success]
+    assert_equal "Site updated", flash[:success]
     site.reload
-    assert_equal 'New Site', site.label
-    assert_equal 'new.site.local', site.hostname
-    assert_equal 'es', site.locale
+    assert_equal "New Site", site.label
+    assert_equal "new.site.local", site.hostname
+    assert_equal "es", site.locale
   end
 
   def test_update_failure
     site = comfy_cms_sites(:default)
-    r :put, comfy_admin_cms_site_path(id: site), params: {site: {
-      hostname: ''
-    }}
+    r :put, comfy_admin_cms_site_path(id: site), params: { site: {
+      hostname: ""
+    } }
     assert_response :success
     assert_template :edit
     site.reload
-    assert_not_equal '', site.hostname
-    assert_equal 'Failed to update site', flash[:danger]
+    assert_not_equal "", site.hostname
+    assert_equal "Failed to update site", flash[:danger]
   end
 
   def test_destroy
-    assert_difference 'Comfy::Cms::Site.count', -1 do
+    assert_difference "Comfy::Cms::Site.count", -1 do
       r :delete, comfy_admin_cms_site_path(id: comfy_cms_sites(:default))
       assert_response :redirect
       assert_redirected_to action: :index
-      assert_equal 'Site deleted', flash[:success]
+      assert_equal "Site deleted", flash[:success]
     end
   end
+
 end

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

@@ -1,4 +1,4 @@
-require_relative '../../../../test_helper'
+require_relative "../../../../test_helper"
 
 class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTest
 
@@ -23,12 +23,12 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTes
 
   def test_get_index_with_category
     category = @site.categories.create!(
-      label:            'Test Category',
-      categorized_type: 'Comfy::Cms::Snippet'
+      label:            "Test Category",
+      categorized_type: "Comfy::Cms::Snippet"
     )
     category.categorizations.create!(categorized: @snippet)
 
-    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: {categories: category.label}
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: { categories: category.label }
     assert_response :success
     assert assigns(:snippets)
     assert_equal 1, assigns(:snippets).count
@@ -36,7 +36,7 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTes
   end
 
   def test_get_index_with_category_invalid
-    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: {categories: 'invalid'}
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: { categories: "invalid" }
     assert_response :success
     assert assigns(:snippets)
     assert_equal 0, assigns(:snippets).count
@@ -59,83 +59,83 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTes
   end
 
   def test_get_edit_with_params
-    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
-      label: 'New Label'
-    }}
+    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: { snippet: {
+      label: "New Label"
+    } }
     assert_response :success
     assert assigns(:snippet)
-    assert_equal 'New Label', assigns(:snippet).label
+    assert_equal "New Label", assigns(:snippet).label
   end
 
   def test_get_edit_failure
-    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: 'invalid')
+    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: "invalid")
     assert_response :redirect
     assert_redirected_to action: :index
-    assert_equal 'Snippet not found', flash[:danger]
+    assert_equal "Snippet not found", flash[:danger]
   end
 
   def test_create
-    assert_difference 'Comfy::Cms::Snippet.count' do
-      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: {snippet: {
-        label:      'Test Snippet',
-        identifier: 'test-snippet',
-        content:    'Test Content'
-      }}
+    assert_difference "Comfy::Cms::Snippet.count" do
+      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: { snippet: {
+        label:      "Test Snippet",
+        identifier: "test-snippet",
+        content:    "Test Content"
+      } }
       assert_response :redirect
       snippet = Comfy::Cms::Snippet.last
       assert_equal @site, snippet.site
       assert_redirected_to action: :edit, id: snippet
-      assert_equal 'Snippet created', flash[:success]
+      assert_equal "Snippet created", flash[:success]
     end
   end
 
   def test_creation_failure
-    assert_no_difference 'Comfy::Cms::Snippet.count' do
-      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: {snippet: { }}
+    assert_no_difference "Comfy::Cms::Snippet.count" do
+      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: { snippet: {} }
       assert_response :success
       assert_template :new
-      assert_equal 'Failed to create snippet', flash[:danger]
+      assert_equal "Failed to create snippet", flash[:danger]
     end
   end
 
   def test_update
-    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
-      label:   'New-Snippet',
-      content: 'New Content'
-    }}
+    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: { snippet: {
+      label:   "New-Snippet",
+      content: "New Content"
+    } }
     assert_response :redirect
     assert_redirected_to action: :edit, site_id: @site, id: @snippet
-    assert_equal 'Snippet updated', flash[:success]
+    assert_equal "Snippet updated", flash[:success]
     @snippet.reload
-    assert_equal 'New-Snippet', @snippet.label
-    assert_equal 'New Content', @snippet.content
+    assert_equal "New-Snippet", @snippet.label
+    assert_equal "New Content", @snippet.content
   end
 
   def test_update_failure
-    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
-      identifier: ''
-    }}
+    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: { snippet: {
+      identifier: ""
+    } }
     assert_response :success
     assert_template :edit
     @snippet.reload
-    assert_not_equal '', @snippet.identifier
-    assert_equal 'Failed to update snippet', flash[:danger]
+    assert_not_equal "", @snippet.identifier
+    assert_equal "Failed to update snippet", flash[:danger]
   end
 
   def test_destroy
-    assert_difference 'Comfy::Cms::Snippet.count', -1 do
+    assert_difference "Comfy::Cms::Snippet.count", -1 do
       r :delete, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet)
       assert_response :redirect
       assert_redirected_to action: :index
-      assert_equal 'Snippet deleted', flash[:success]
+      assert_equal "Snippet deleted", flash[:success]
     end
   end
 
   def test_reorder
     snippet_one = @snippet
     snippet_two = @site.snippets.create!(
-      label:      'test',
-      identifier: 'test'
+      label:      "test",
+      identifier: "test"
     )
     assert_equal 0, snippet_one.position
     assert_equal 1, snippet_two.position
@@ -150,4 +150,5 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTes
     assert_equal 1, snippet_one.position
     assert_equal 0, snippet_two.position
   end
+
 end

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

@@ -1,4 +1,4 @@
-require_relative '../../../../test_helper'
+require_relative "../../../../test_helper"
 
 class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::IntegrationTest
 
@@ -44,10 +44,10 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
   def test_create
     assert_count_difference [Comfy::Cms::Translation] do
       path = comfy_admin_cms_site_page_translations_path(@site, @page)
-      r :post, path, params: {translation: {
+      r :post, path, params: { translation: {
         locale: "es",
         label:  "Test Translation"
-      }}
+      } }
       assert_response :redirect
       translation = Comfy::Cms::Translation.last
       assert_equal @page, translation.page
@@ -59,7 +59,7 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
   def test_creation_failure
     assert_count_no_difference [Comfy::Cms::Translation] do
       path = comfy_admin_cms_site_page_translations_path(@site, @page)
-      r :post, path, params: {translation: { }}
+      r :post, path, params: { translation: {} }
       assert_response :success
       assert_template :new
       assert_equal "Failed to create translation", flash[:danger]
@@ -68,9 +68,9 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
 
   def test_update
     path = comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
-    r :put, path, params: {translation: {
+    r :put, path, params: { translation: {
       label: "Updated Translation"
-    }}
+    } }
     assert_response :redirect
     assert_redirected_to action: :edit, site_id: @site, page_id: @page, id: @translation
     assert_equal "Translation updated", flash[:success]
@@ -80,9 +80,9 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
 
   def test_update_failure
     path = comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
-    r :put, path, params: {translation: {
+    r :put, path, params: { translation: {
       locale: ""
-    }}
+    } }
     assert_response :success
     assert_template :edit
     @translation.reload
@@ -132,20 +132,20 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
   def test_creation_preview
     assert_count_no_difference [Comfy::Cms::Translation] do
       r :post, comfy_admin_cms_site_page_translations_path(@site, @page), params: {
-        preview: 'Preview',
+        preview: "Preview",
         translation: {
           label:      "Test Page",
           layout_id:  @layout.id,
           locale:     "fr",
           fragments_attributes: [
-            { identifier: 'content',
-              content:    'preview content' }
+            { identifier: "content",
+              content:    "preview content" }
           ]
         }
       }
       assert_response :success
-      assert_match /preview content/, response.body
-      assert_equal 'text/html', response.content_type
+      assert_match %r{preview content}, response.body
+      assert_equal "text/html", response.content_type
 
       assert_equal @site, assigns(:cms_site)
       assert_equal @layout, assigns(:cms_layout)
@@ -159,23 +159,24 @@ class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::Integratio
   def test_update_preview
     assert_count_no_difference [Comfy::Cms::Page] do
       r :put, comfy_admin_cms_site_page_translation_path(@site, @page, @translation), params: {
-        preview: 'Preview',
+        preview: "Preview",
         translation: {
-        label: 'Updated Label',
-        fragments_attributes: [
-          { identifier: 'content',
-            content:    'preview content' }
+          label: "Updated Label",
+          fragments_attributes: [
+            { identifier: "content",
+              content:    "preview content" }
           ]
         }
       }
       assert_response :success
-      assert_match /preview content/, response.body
+      assert_match %r{preview content}, response.body
       @translation.reload
-      assert_not_equal 'Updated Label', @page.label
+      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)
     end
   end
+
 end

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

@@ -1,4 +1,4 @@
-require_relative '../../../test_helper'
+require_relative "../../../test_helper"
 
 class Comfy::Cms::AssetsControllerTest < ActionDispatch::IntegrationTest
 
@@ -8,53 +8,54 @@ class Comfy::Cms::AssetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_render_css_with_site_with_path
-    @site.update_column(:path, 'some/path')
+    @site.update_column(:path, "some/path")
 
     get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
-    assert_match 'text/css', response.content_type
+    assert_match "text/css", response.content_type
     assert_equal @layout.css, response.body
   end
 
   def test_render_css_without_cache_buster
     get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
-    assert_match 'text/css', response.content_type
-    assert_equal 'max-age=0, private, must-revalidate', response.headers['Cache-Control']
+    assert_match "text/css", response.content_type
+    assert_equal "max-age=0, private, must-revalidate", response.headers["Cache-Control"]
     assert_equal @layout.css, response.body
   end
 
   def test_render_css_with_cache_buster
     get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier, cache_buster: @layout.cache_buster)
     assert_response :success
-    assert_match 'text/css', response.content_type
-    assert_equal 'max-age=31556952, public', response.headers['Cache-Control']
+    assert_match "text/css", response.content_type
+    assert_equal "max-age=31556952, public", response.headers["Cache-Control"]
     assert_equal @layout.css, response.body
   end
 
   def test_render_css_not_found
-    get comfy_cms_render_css_path(site_id: @site, identifier: 'invalid')
+    get comfy_cms_render_css_path(site_id: @site, identifier: "invalid")
     assert_response 404
   end
 
   def test_render_js_without_cache_buster
     get comfy_cms_render_js_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
-    assert_equal 'application/javascript', response.content_type
-    assert_equal 'max-age=0, private, must-revalidate', response.headers['Cache-Control']
+    assert_equal "application/javascript", response.content_type
+    assert_equal "max-age=0, private, must-revalidate", response.headers["Cache-Control"]
     assert_equal @layout.js, response.body
   end
 
   def test_render_js_with_cache_buster
     get comfy_cms_render_js_path(site_id: @site, identifier: @layout.identifier, cache_buster: @layout.cache_buster)
     assert_response :success
-    assert_equal 'application/javascript', response.content_type
-    assert_equal 'max-age=31556952, public', response.headers['Cache-Control']
+    assert_equal "application/javascript", response.content_type
+    assert_equal "max-age=31556952, public", response.headers["Cache-Control"]
     assert_equal @layout.js, response.body
   end
 
   def test_render_js_not_found
-    get comfy_cms_render_js_path(site_id: @site, identifier: 'bogus')
+    get comfy_cms_render_js_path(site_id: @site, identifier: "bogus")
     assert_response 404
   end
+
 end