comfortable_mexican_sofa 2.0.8 → 2.0.9

data/test/lib/content/tags/snippet_test.rb

@@ -7,7 +7,7 @@ class ContentTagsSnippetTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "default")
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(context: @page, params: ["default"])
     assert_equal "default", tag.identifier
     assert_equal comfy_cms_snippets(:default), tag.snippet
   end
@@ -15,22 +15,22 @@ class ContentTagsSnippetTest < ActiveSupport::TestCase
   def test_init_without_identifier
     message = "Missing identifier for snippet tag"
     assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
-      ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "")
+      ComfortableMexicanSofa::Content::Tag::Snippet.new(context: @page)
     end
   end
 
   def test_snippet_new_record
-    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "new")
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(context: @page, params: ["new"])
     assert tag.snippet.new_record?
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "default")
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(context: @page, params: ["default"])
     assert_equal "snippet content", tag.content
   end
 
   def test_content_new_record
-    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "new")
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(context: @page, params: ["new"])
     assert_nil tag.content
   end
 

data/test/lib/content/tags/template_test.rb

@@ -3,33 +3,48 @@ require_relative "../../../test_helper"
 class ContentTagsTemplateTest < ActiveSupport::TestCase
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(
+      context: @page,
+      params: ["path/to/template"]
+    )
     assert_equal "path/to/template", tag.path
   end
 
   def test_init_without_path
     message = "Missing template path for template tag"
     assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
-      ComfortableMexicanSofa::Content::Tag::Template.new(@page, "")
+      ComfortableMexicanSofa::Content::Tag::Template.new(context: @page)
     end
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(
+      context: @page,
+      params:  ["path/to/template"]
+    )
     assert_equal "<%= render template: \"path/to/template\" %>", tag.content
   end
 
   def test_render
-    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(
+      context:  @page,
+      params:   ["path/to/template"]
+    )
     assert_equal "<%= render template: \"path/to/template\" %>", tag.render
   end
 
   def test_render_with_whitelist
     ComfortableMexicanSofa.config.allowed_templates = ["allowed/path"]
-    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "allowed/path")
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(
+      context: @page,
+      params: ["allowed/path"]
+    )
     assert_equal "<%= render template: \"allowed/path\" %>", tag.render
 
-    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "not_allowed/path")
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(
+      context: @page,
+      params:  ["not_allowed/path"]
+    )
     assert_equal "", tag.render
   end
 

data/test/lib/content/tags/text_test.rb

@@ -7,7 +7,7 @@ class ContentTagsTextTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Text.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Text.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 

data/test/lib/content/tags/textarea_test.rb

@@ -7,7 +7,7 @@ class ContentTagsTextAreaTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::TextArea.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::TextArea.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 

data/test/lib/content/tags/wysiwyg_test.rb

@@ -7,7 +7,7 @@ class ContentTagsWysiwygTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Wysiwyg.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Wysiwyg.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 

data/test/models/layout_test.rb

@@ -22,44 +22,64 @@ class CmsLayoutTest < ActiveSupport::TestCase
 
   def test_content_tokens
     layout = Comfy::Cms::Layout.new(content: "a {{cms:text content}} b")
-    assert_equal ["a ", { tag_class: "text", tag_params: "content" }, " b"],
-      layout.content_tokens
+    expected = [
+      "a ",
+      { tag_class: "text", tag_params: "content", source: "{{cms:text content}}" },
+      " b"
+    ]
+    assert_equal expected, layout.content_tokens
   end
 
   def test_content_tokens_nested
     layout_a = Comfy::Cms::Layout.new(content: "a {{cms:text content}} {{cms:text footer}} b")
     layout_b = Comfy::Cms::Layout.new(content: "c {{cms:text content}} d")
     layout_b.parent = layout_a
-    assert_equal [
-      "a ", "c ", { tag_class: "text", tag_params: "content" }, " d", " ",
-      { tag_class: "text", tag_params: "footer" }, " b"
-    ], layout_b.content_tokens
+    expected = [
+      "a ",
+      "c ",
+      { tag_class: "text", tag_params: "content", source: "{{cms:text content}}" },
+      " d",
+      " ",
+      { tag_class: "text", tag_params: "footer", source: "{{cms:text footer}}" },
+      " b"
+    ]
+    assert_equal expected, layout_b.content_tokens
   end
 
   def test_content_tokens_nested_with_fragment_subclass_tag
     layout_a = Comfy::Cms::Layout.new(content: "a {{cms:markdown content}} b")
     layout_b = Comfy::Cms::Layout.new(content: "c {{cms:text content}} d")
     layout_b.parent = layout_a
-    assert_equal [
-      "a ", "c ", { tag_class: "text", tag_params: "content" }, " d", " b"
-    ], layout_b.content_tokens
+    expected = [
+      "a ",
+      "c ",
+      { tag_class: "text", tag_params: "content", source: "{{cms:text content}}" },
+      " d",
+      " b"
+    ]
+    assert_equal expected, layout_b.content_tokens
   end
 
   def test_content_tokens_nested_with_non_fragment_subclass_tag
     layout_a = Comfy::Cms::Layout.new(content: "a {{cms:snippet content}} b")
     layout_b = Comfy::Cms::Layout.new(content: "c {{cms:text content}} d")
     layout_b.parent = layout_a
-    assert_equal [
-      "c ", { tag_class: "text", tag_params: "content" }, " d"
-    ], layout_b.content_tokens
+    expected = [
+      "c ",
+      { tag_class: "text", tag_params: "content", source: "{{cms:text content}}" },
+      " d"
+    ]
+    assert_equal expected, layout_b.content_tokens
   end
 
   def test_content_tokens_nested_without_content_tag
     layout_a = Comfy::Cms::Layout.new(content: "a {{cms:text footer}} b")
     layout_b = Comfy::Cms::Layout.new(content: "c {{cms:text content}} d")
     layout_b.parent = layout_a
-    assert_equal ["c ", { tag_class: "text", tag_params: "content" }, " d"],
-      layout_b.content_tokens
+    expected = [
+      "c ", { tag_class: "text", tag_params: "content", source: "{{cms:text content}}" }, " d"
+    ]
+    assert_equal expected, layout_b.content_tokens
   end
 
   def test_label_assignment

data/test/models/translation_test.rb

@@ -3,7 +3,9 @@ require_relative "../test_helper"
 class CmsPageTest < ActiveSupport::TestCase
 
   setup do
-    @page = comfy_cms_pages(:default)
+    @site         = comfy_cms_sites(:default)
+    @page         = comfy_cms_pages(:default)
+    @translation  = comfy_cms_translations(:default)
   end
 
   def test_fixtures_validity
@@ -22,7 +24,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_validation_on_locale_uniqueness
     translation = @page.translations.new(
       label: "Test",
-      locale: comfy_cms_translations(:default).locale
+      locale: @translation.locale
     )
     assert translation.invalid?
     assert_has_errors_on translation, :locale
@@ -31,7 +33,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_validation_on_locale_uniqueness_against_site
     translation = @page.translations.new(
       label: "Test",
-      locale: comfy_cms_sites(:default).locale
+      locale: @site.locale
     )
     assert translation.invalid?
     assert_has_errors_on translation, :locale
@@ -54,8 +56,12 @@ class CmsPageTest < ActiveSupport::TestCase
 
   def test_scope_published
     assert_equal 1, Comfy::Cms::Translation.published.count
-    comfy_cms_translations(:default).update_columns(is_published: false)
+    @translation.update_columns(is_published: false)
     assert_equal 0, Comfy::Cms::Translation.published.count
   end
 
+  def test_site_delegation
+    assert_equal @site, @translation.site
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -746,7 +746,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Rails 5.2+ CMS Engine