comfortable_mexican_sofa 2.0.2 → 2.0.3

data/test/integration/js_variables_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
 
@@ -17,4 +17,5 @@ class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
 
     assert response.body.match(js_vars)
   end
+
 end

data/test/integration/render_cms_test.rb

@@ -1,18 +1,18 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def setup
     super
     Rails.application.routes.draw do
-      get '/render-basic'           => 'render_test#render_basic'
-      get '/render-page'            => 'render_test#render_page'
-      get '/site-path/render-page'  => 'render_test#render_page'
-      get '/render-layout'          => 'render_test#render_layout'
+      get "/render-basic"           => "render_test#render_basic"
+      get "/render-page"            => "render_test#render_page"
+      get "/site-path/render-page"  => "render_test#render_page"
+      get "/render-layout"          => "render_test#render_layout"
     end
-    comfy_cms_layouts(:default).update_columns(content: '{{cms:text content}}')
+    comfy_cms_layouts(:default).update_columns(content: "{{cms:text content}}")
     comfy_cms_pages(:child).update_attributes(fragments_attributes: [
-      { identifier: 'content', content: 'TestBlockContent' }
+      { identifier: "content", content: "TestBlockContent" }
     ])
   end
 
@@ -21,28 +21,32 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   end
 
   def create_site_b
-    site    = Comfy::Cms::Site.create!(
-      identifier: 'site-b',
-      hostname:   'site-b.test')
-    layout  = site.layouts.create!(
-      identifier: 'default',
-      content:    'site-b {{cms:text content}}')
-    page    = site.pages.create!(
-      label:  'default',
+    site = Comfy::Cms::Site.create!(
+      identifier: "site-b",
+      hostname:   "site-b.test"
+    )
+    layout = site.layouts.create!(
+      identifier: "default",
+      content:    "site-b {{cms:text content}}"
+    )
+    site.pages.create!(
+      label:  "default",
       layout: layout,
-      fragments_attributes: [{identifier: 'content', content: 'SiteBContent'}])
+      fragments_attributes: [{ identifier: "content", content: "SiteBContent" }]
+    )
   end
 
   class ::RenderTestController < ApplicationController
-    append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
+
+    append_view_path(File.expand_path("../fixtures/views", File.dirname(__FILE__)))
 
     def render_basic
       case params[:type]
-      when 'text'
-        render plain: 'TestText'
-      when 'update'
+      when "text"
+        render plain: "TestText"
+      when "update"
         render :update do |page|
-          page.alert('rendered text')
+          page.alert("rendered text")
         end
       else
         render
@@ -51,146 +55,146 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
     def render_page
       case params[:type]
-      when 'page_implicit'
+      when "page_implicit"
         render
-      when 'page_explicit'
-        render cms_page: '/test-page'
-      when 'page_explicit_with_status'
-        render cms_page: '/test-page', status: 404
-      when 'page_explicit_with_site'
-        render cms_page: '/', cms_site: 'site-b'
-      when 'page_explicit_with_blocks'
-        render cms_page: '/test-page', cms_fragments: {
-          content: 'custom page content'
+      when "page_explicit"
+        render cms_page: "/test-page"
+      when "page_explicit_with_status"
+        render cms_page: "/test-page", status: 404
+      when "page_explicit_with_site"
+        render cms_page: "/", cms_site: "site-b"
+      when "page_explicit_with_blocks"
+        render cms_page: "/test-page", cms_fragments: {
+          content: "custom page content"
         }
       else
-        raise 'Invalid or no param[:type] provided'
+        raise "Invalid or no param[:type] provided"
       end
     end
 
     def render_layout
-      @test_value = 'TestValue'
+      @test_value = "TestValue"
       case params[:type]
-      when 'layout_defaults'
-        render cms_layout: 'default'
-      when 'layout'
-        render cms_layout: 'default', cms_fragments: {
-          content:    'TestText',
-          content_b:  {partial: 'render_test/test' },
-          content_c:  {template: 'render_test/render_layout' }
+      when "layout_defaults"
+        render cms_layout: "default"
+      when "layout"
+        render cms_layout: "default", cms_fragments: {
+          content:    "TestText",
+          content_b:  { partial: "render_test/test" },
+          content_c:  { template: "render_test/render_layout" }
         }
-      when 'layout_with_status'
-        render cms_layout: 'default', status: 404
-      when 'layout_invalid'
-        render cms_layout: 'invalid'
-      when 'layout_defaults_with_site'
-        render cms_layout: 'default', cms_site: 'site-b'
-      when 'layout_with_action'
-        render cms_layout: 'default', action: :new
+      when "layout_with_status"
+        render cms_layout: "default", status: 404
+      when "layout_invalid"
+        render cms_layout: "invalid"
+      when "layout_defaults_with_site"
+        render cms_layout: "default", cms_site: "site-b"
+      when "layout_with_action"
+        render cms_layout: "default", action: :new
       else
-        raise 'Invalid or no param[:type] provided'
+        raise "Invalid or no param[:type] provided"
       end
     end
 
-    def new
-    end
+    def new; end
+
   end
 
   # -- Basic Render Tests ------------------------------------------------------
   def test_text
-    get '/render-basic?type=text'
+    get "/render-basic?type=text"
     assert_response :success
-    assert_equal 'TestText', response.body
+    assert_equal "TestText", response.body
   end
 
   def test_implicit_cms_page_failure
     Comfy::Cms::Site.destroy_all
     assert_exception_raised ActionView::MissingTemplate do
-      get '/render-basic'
+      get "/render-basic"
     end
   end
 
   # -- Page Render Test --------------------------------------------------------
   def test_implicit_cms_page
     page = comfy_cms_pages(:child)
-    page.update_attributes(slug: 'render-basic')
-    get '/render-basic?type=page_implicit'
+    page.update_attributes(slug: "render-basic")
+    get "/render-basic?type=page_implicit"
     assert_response :success
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
     assert_equal page, assigns(:cms_page)
-    assert_equal 'TestBlockContent', response.body
+    assert_equal "TestBlockContent", response.body
   end
 
   def test_implicit_cms_page_with_site_path
-    comfy_cms_sites(:default).update_column(:path, 'site-path')
-    comfy_cms_pages(:child).update_attributes(slug: 'render-page')
-    get '/site-path/render-page?type=page_implicit'
+    comfy_cms_sites(:default).update_column(:path, "site-path")
+    comfy_cms_pages(:child).update_attributes(slug: "render-page")
+    get "/site-path/render-page?type=page_implicit"
     assert_response :success
-    assert_equal 'TestBlockContent', response.body
+    assert_equal "TestBlockContent", response.body
   end
 
   def test_explicit_cms_page
     page = comfy_cms_pages(:child)
-    page.update_attributes(slug: 'test-page')
-    get '/render-page?type=page_explicit'
+    page.update_attributes(slug: "test-page")
+    get "/render-page?type=page_explicit"
     assert_response :success
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
     assert_equal page, assigns(:cms_page)
-    assert_equal 'TestBlockContent', response.body
+    assert_equal "TestBlockContent", response.body
   end
 
   def test_explicit_cms_page_with_status
     page = comfy_cms_pages(:child)
-    page.update_attributes(slug: 'test-page')
-    get '/render-page?type=page_explicit_with_status'
+    page.update_attributes(slug: "test-page")
+    get "/render-page?type=page_explicit_with_status"
     assert_response :not_found
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
     assert_equal page, assigns(:cms_page)
-    assert_equal 'TestBlockContent', response.body
+    assert_equal "TestBlockContent", response.body
   end
 
   def test_explicit_cms_page_failure
     page = comfy_cms_pages(:child)
-    page.update_attributes(slug: 'invalid')
+    page.update_attributes(slug: "invalid")
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
-      get '/render-page?type=page_explicit'
+      get "/render-page?type=page_explicit"
     end
   end
 
   def test_explicit_with_site
     create_site_b
-    get '/render-page?type=page_explicit_with_site'
+    get "/render-page?type=page_explicit_with_site"
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'site-b', assigns(:cms_site).identifier
-    assert_equal 'site-b SiteBContent', response.body
+    assert_equal "site-b", assigns(:cms_site).identifier
+    assert_equal "site-b SiteBContent", response.body
   end
 
   def test_explicit_with_site_failure
     assert_exception_raised ComfortableMexicanSofa::MissingSite do
-      get '/render-page?type=page_explicit_with_site'
+      get "/render-page?type=page_explicit_with_site"
     end
   end
 
   def test_explicit_with_page_blocks
     page = comfy_cms_pages(:child)
-    page.update_attributes(slug: 'test-page')
-    get '/render-page?type=page_explicit_with_blocks'
+    page.update_attributes(slug: "test-page")
+    get "/render-page?type=page_explicit_with_blocks"
     assert_response :success
-    assert_equal 'custom page content', response.body
+    assert_equal "custom page content", response.body
   end
 
   # -- Layout Render Tests -----------------------------------------------------
   def test_cms_layout_defaults
-    get '/render-layout?type=layout_defaults'
+    get "/render-layout?type=layout_defaults"
     assert_response :success
-    assert_equal 'TestTemplate TestValue', response.body
+    assert_equal "TestTemplate TestValue", response.body
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert_equal comfy_cms_layouts(:default), assigns(:cms_layout)
@@ -199,18 +203,18 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   def test_cms_layout
     content = "{{cms:text content}} {{cms:text content_b}} {{cms:text content_c}}"
     comfy_cms_layouts(:default).update_columns(content: content)
-    get '/render-layout?type=layout'
+    get "/render-layout?type=layout"
     assert_response :success
-    assert_equal 'TestText TestPartial TestValue TestTemplate TestValue', response.body
+    assert_equal "TestText TestPartial TestValue TestTemplate TestValue", response.body
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert_equal comfy_cms_layouts(:default), assigns(:cms_layout)
   end
 
   def test_cms_layout_with_status
-    get '/render-layout?type=layout_with_status'
+    get "/render-layout?type=layout_with_status"
     assert_response 404
-    assert_equal 'TestTemplate TestValue', response.body
+    assert_equal "TestTemplate TestValue", response.body
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert_equal comfy_cms_layouts(:default), assigns(:cms_layout)
@@ -219,7 +223,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   def test_cms_layout_with_action
     content = "{{cms:text content}} {{cms:text content_b}} {{cms:text content_c}}"
     comfy_cms_layouts(:default).update_columns(content: content)
-    get '/render-layout?type=layout_with_action'
+    get "/render-layout?type=layout_with_action"
     assert_response :success
     assert_equal "Can render CMS layout and specify action\n  ", response.body
     assert assigns(:cms_site)
@@ -229,22 +233,23 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def test_cms_layout_failure
     assert_exception_raised ComfortableMexicanSofa::MissingLayout do
-      get '/render-layout?type=layout_invalid'
+      get "/render-layout?type=layout_invalid"
     end
   end
 
   def test_cms_layout_defaults_with_site
     create_site_b
-    get '/render-layout?type=layout_defaults_with_site'
+    get "/render-layout?type=layout_defaults_with_site"
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'site-b', assigns(:cms_site).identifier
-    assert_equal 'site-b TestTemplate TestValue', response.body
+    assert_equal "site-b", assigns(:cms_site).identifier
+    assert_equal "site-b TestTemplate TestValue", response.body
   end
 
   def test_cms_layout_defaults_with_site_failure
     assert_exception_raised ComfortableMexicanSofa::MissingSite do
-      get '/render-layout?type=layout_defaults_with_site'
+      get "/render-layout?type=layout_defaults_with_site"
     end
   end
+
 end

data/test/integration/routing_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class RoutingIntergrationTest < ActionDispatch::IntegrationTest
 
@@ -10,9 +10,10 @@ class RoutingIntergrationTest < ActionDispatch::IntegrationTest
     assert_nil ComfortableMexicanSofa.config.public_cms_path
 
     Rails.application.routes.draw do
-      comfy_route :cms, path: '/custom'
+      comfy_route :cms, path: "/custom"
     end
 
-    assert_equal '/custom', ComfortableMexicanSofa.config.public_cms_path
+    assert_equal "/custom", ComfortableMexicanSofa.config.public_cms_path
   end
+
 end

data/test/integration/seeds_test.rb

@@ -1,20 +1,20 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class SeedsIntergrationTest < ActionDispatch::IntegrationTest
 
   setup do
     @site = comfy_cms_sites(:default)
-    @site.update_columns(identifier: 'sample-site')
+    @site.update_columns(identifier: "sample-site")
   end
 
   def test_seeds_disabled
-    assert_no_difference ['Comfy::Cms::Layout.count', 'Comfy::Cms::Page.count', 'Comfy::Cms::Snippet.count'] do
-      get '/'
+    assert_no_difference ["Comfy::Cms::Layout.count", "Comfy::Cms::Page.count", "Comfy::Cms::Snippet.count"] do
+      get "/"
       assert_response :success
 
-      assert_equal 'Default Page', Comfy::Cms::Page.root.label
-      assert_equal 'Default Layout', Comfy::Cms::Layout.find_by_identifier('default').label
-      assert_equal 'Default Snippet', Comfy::Cms::Snippet.find_by_identifier('default').label
+      assert_equal "Default Page", Comfy::Cms::Page.root.label
+      assert_equal "Default Layout", Comfy::Cms::Layout.find_by_identifier("default").label
+      assert_equal "Default Snippet", Comfy::Cms::Snippet.find_by_identifier("default").label
     end
   end
 
@@ -24,18 +24,17 @@ class SeedsIntergrationTest < ActionDispatch::IntegrationTest
     Comfy::Cms::Page.destroy_all
     Comfy::Cms::Snippet.destroy_all
 
-    assert_difference 'Comfy::Cms::Page.count', 3 do
-      assert_difference 'Comfy::Cms::Layout.count', 2 do
-        assert_difference 'Comfy::Cms::Snippet.count', 1 do
-          get '/'
+    assert_difference "Comfy::Cms::Page.count", 3 do
+      assert_difference "Comfy::Cms::Layout.count", 2 do
+        assert_difference "Comfy::Cms::Snippet.count", 1 do
+          get "/"
           assert_response :success
 
-          assert_equal 'Home Seed Page', Comfy::Cms::Page.root.label
-          assert_equal 'Default Seed Layout', Comfy::Cms::Layout.find_by_identifier('default').label
-          assert_equal 'Default Seed Snippet', Comfy::Cms::Snippet.find_by_identifier('default').label
+          assert_equal "Home Seed Page", Comfy::Cms::Page.root.label
+          assert_equal "Default Seed Layout", Comfy::Cms::Layout.find_by_identifier("default").label
+          assert_equal "Default Seed Snippet", Comfy::Cms::Snippet.find_by_identifier("default").label
 
-
-          file_path = url_for(ActiveStorage::Blob.find_by(filename: 'header.png'))
+          file_path = url_for(ActiveStorage::Blob.find_by(filename: "header.png"))
           file_path = file_path.sub("http://test.host", "")
           out = <<-HTML.strip_heredoc
             <html>
@@ -62,12 +61,12 @@ class SeedsIntergrationTest < ActionDispatch::IntegrationTest
     Comfy::Cms::Page.destroy_all
     Comfy::Cms::Snippet.destroy_all
 
-    assert_difference 'Comfy::Cms::Page.count', 3 do
-      assert_difference 'Comfy::Cms::Layout.count', 2 do
-        assert_difference 'Comfy::Cms::Snippet.count', 1 do
-           r :get, "/admin/sites/#{@site.id}/pages"
-           assert_response :success
-           assert_equal 'CMS Seeds are enabled. All changes done here will be discarded.', flash[:warning]
+    assert_difference "Comfy::Cms::Page.count", 3 do
+      assert_difference "Comfy::Cms::Layout.count", 2 do
+        assert_difference "Comfy::Cms::Snippet.count", 1 do
+          r :get, "/admin/sites/#{@site.id}/pages"
+          assert_response :success
+          assert_equal "CMS Seeds are enabled. All changes done here will be discarded.", flash[:warning]
         end
       end
     end

data/test/integration/sites_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class SitesIntegrationTest < ActionDispatch::IntegrationTest
 
@@ -15,63 +15,63 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
     r :get, comfy_admin_cms_path
     assert_response :redirect
     assert_redirected_to new_comfy_admin_cms_site_path
-    assert_equal 'Site not found', flash[:danger]
+    assert_equal "Site not found", flash[:danger]
   end
 
   def test_get_public_page_with_single_site
-    host! 'bogus.host'
-    get '/'
+    host! "bogus.host"
+    get "/"
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'test.host', assigns(:cms_site).hostname
+    assert_equal "test.host", assigns(:cms_site).hostname
   end
 
   def test_get_public_page_with_sites_with_different_paths
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(identifier: 'site-a', hostname: 'test.host', path: '')
-    site_b = Comfy::Cms::Site.create!(identifier: 'site-b', hostname: 'test.host', path: 'path-b')
-    site_c = Comfy::Cms::Site.create!(identifier: 'site-c', hostname: 'test.host', path: 'path-c/child')
+    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "test.host", path: "")
+    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "test.host", path: "path-b")
+    site_c = Comfy::Cms::Site.create!(identifier: "site-c", hostname: "test.host", path: "path-c/child")
 
     [site_a, site_b, site_c].each do |site|
-      layout  = site.layouts.create!(identifier: 'test')
-      site.pages.create!(label: 'index', layout: layout)
-      site.pages.create!(label: '404', slug: '404', layout: layout)
+      layout = site.layouts.create!(identifier: "test")
+      site.pages.create!(label: "index", layout: layout)
+      site.pages.create!(label: "404", slug: "404", layout: layout)
     end
 
-    %w(/ /path-a /path-a/child /path-c).each do |path|
+    %w[/ /path-a /path-a/child /path-c].each do |path|
       get path
       assert assigns(:cms_site), path
       assert_equal site_a, assigns(:cms_site)
-      assert_equal path.gsub(/^\//, ''), @controller.params[:cms_path].to_s
+      assert_equal path.gsub(%r{^/}, ""), @controller.params[:cms_path].to_s
     end
 
-    %w(/path-b /path-b/child).each do |path|
+    %w[/path-b /path-b/child].each do |path|
       get path
       assert assigns(:cms_site), path
       assert_equal site_b, assigns(:cms_site)
-      assert_equal path.gsub(/^\/path-b/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
+      assert_equal path.gsub(%r{^/path-b}, "").gsub(%r{^/}, ""), @controller.params[:cms_path].to_s
     end
 
-    %w(/path-c/child /path-c/child/child).each do |path|
+    %w[/path-c/child /path-c/child/child].each do |path|
       get path
       assert assigns(:cms_site), path
       assert_equal site_c, assigns(:cms_site)
-      assert_equal path.gsub(/^\/path-c\/child/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
+      assert_equal path.gsub(%r{^/path-c/child}, "").gsub(%r{^/}, ""), @controller.params[:cms_path].to_s
     end
   end
 
   def test_get_public_page_with_host_with_port
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(identifier: 'site-a', hostname: 'test.host:3000')
-    site_b = Comfy::Cms::Site.create!(identifier: 'site-b', hostname: 'test.host')
+    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "test.host:3000")
+    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "test.host")
 
     [site_a, site_b].each do |site|
-      layout  = site.layouts.create!(identifier: 'test')
-      site.pages.create!(label: 'index', layout: layout)
-      site.pages.create!(label: '404', slug: '404', layout: layout)
+      layout = site.layouts.create!(identifier: "test")
+      site.pages.create!(label: "index", layout: layout)
+      site.pages.create!(label: "404", slug: "404", layout: layout)
     end
 
-    get '/'
+    get "/"
     assert assigns(:cms_site)
     assert_equal site_b, assigns(:cms_site)
   end
@@ -81,7 +81,7 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_equal :en, I18n.locale
 
-    comfy_cms_sites(:default).update_columns(locale: 'fr')
+    comfy_cms_sites(:default).update_columns(locale: "fr")
     r :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
     assert_response :success
     assert_equal :fr, I18n.locale
@@ -90,7 +90,7 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
   def test_get_admin_with_forced_locale
     ComfortableMexicanSofa.config.admin_locale = :en
 
-    comfy_cms_sites(:default).update_columns(locale: 'fr')
+    comfy_cms_sites(:default).update_columns(locale: "fr")
     r :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
     assert_response :success
     assert_equal :en, I18n.locale
@@ -103,4 +103,5 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
 
     I18n.default_locale = :en
   end
+
 end

data/test/integration/view_hooks_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class ViewHooksIntegrationTest < ActionDispatch::IntegrationTest
 
@@ -7,33 +7,33 @@ class ViewHooksIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   def test_hooks_rendering
-    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
-    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
+    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path("../fixtures/views", File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, "/nav_hook")
 
     r :get, comfy_admin_cms_sites_path
     assert_response :success
-    assert_match /hook_content/, response.body
+    assert_match %r{hook_content}, response.body
   end
 
   def test_hooks_rendering_with_multiples
-    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
-    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
-    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2')
+    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path("../fixtures/views", File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, "/nav_hook")
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, "/nav_hook_2")
 
     r :get, comfy_admin_cms_sites_path
     assert_response :success
-    assert_match /hook_content/, response.body
-    assert_match /<hook_content_2>/, response.body
+    assert_match %r{hook_content}, response.body
+    assert_match %r{<hook_content_2>}, response.body
   end
 
   def test_hooks_rendering_with_proper_order
-    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
-    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2', 0)
-    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook', 1)
+    Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path("../fixtures/views", File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, "/nav_hook_2", 0)
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, "/nav_hook", 1)
 
     r :get, comfy_admin_cms_sites_path
     assert_response :success
-    assert_match /<hook_content_2>hook_content/, response.body
+    assert_match %r{<hook_content_2>hook_content}, response.body
   end
 
   def test_hooks_rendering_with_no_hook
@@ -41,6 +41,7 @@ class ViewHooksIntegrationTest < ActionDispatch::IntegrationTest
 
     r :get, comfy_admin_cms_sites_path
     assert_response :success
-    assert_no_match /hook_content/, response.body
+    assert_no_match %r{hook_content}, response.body
   end
+
 end