comfortable_mexican_sofa 1.6.23 → 1.6.24
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/assets/javascripts/comfortable_mexican_sofa/application.js +17 -16
- data/app/assets/stylesheets/comfortable_mexican_sofa/form.css +48 -0
- data/app/controllers/cms_admin/files_controller.rb +1 -1
- data/app/models/cms/file.rb +2 -1
- data/app/models/cms/page.rb +26 -6
- data/app/views/cms_admin/categories/_show.html.erb +1 -1
- data/app/views/cms_admin/files/_file.html.erb +1 -1
- data/app/views/cms_admin/files/index.html.erb +1 -1
- data/app/views/cms_admin/layouts/_index_branch.html.erb +1 -1
- data/app/views/cms_admin/pages/_form.html.erb +1 -0
- data/app/views/cms_admin/pages/_form_blocks.html.erb +29 -5
- data/app/views/cms_admin/pages/_index_branch.html.erb +1 -1
- data/app/views/cms_admin/pages/form_blocks.js.erb +2 -1
- data/app/views/cms_admin/sites/index.html.erb +1 -1
- data/app/views/cms_admin/snippets/index.html.erb +1 -1
- data/comfortable_mexican_sofa.gemspec +4 -3
- data/config/locales/ru.yml +235 -0
- data/lib/comfortable_mexican_sofa/configuration.rb +24 -23
- data/lib/comfortable_mexican_sofa/tag.rb +6 -1
- data/lib/comfortable_mexican_sofa/tags/asset.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/collection.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_datetime.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_integer.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_string.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/field_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/file.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_datetime.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_file.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_files.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_integer.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_string.rb +1 -1
- data/lib/comfortable_mexican_sofa/tags/page_text.rb +1 -1
- data/lib/comfortable_mexican_sofa/view_methods.rb +10 -1
- data/test/functional/cms_admin/pages_controller_test.rb +18 -18
- data/test/functional/cms_content_controller_test.rb +6 -6
- data/test/gemfiles/Gemfile.rails.3.0 +1 -1
- data/test/gemfiles/Gemfile.rails.3.1 +1 -1
- data/test/gemfiles/Gemfile.rails.3.2 +1 -1
- data/test/integration/fixtures_test.rb +1 -1
- data/test/integration/mirrors_test.rb +1 -1
- data/test/integration/render_cms_test.rb +7 -7
- data/test/integration/sites_test.rb +3 -3
- data/test/test_helper.rb +15 -0
- data/test/unit/fixtures_test.rb +10 -10
- data/test/unit/mirrors_test.rb +1 -1
- data/test/unit/models/block_test.rb +3 -3
- data/test/unit/models/categorization_test.rb +2 -2
- data/test/unit/models/file_test.rb +1 -1
- data/test/unit/models/layout_test.rb +3 -3
- data/test/unit/models/page_test.rb +21 -3
- data/test/unit/models/site_test.rb +1 -1
- data/test/unit/models/snippet_test.rb +1 -1
- data/test/unit/revisions_test.rb +5 -5
- data/test/unit/tag_test.rb +27 -1
- data/test/unit/tags/collection_test.rb +7 -0
- data/test/unit/tags/field_datetime_test.rb +6 -0
- data/test/unit/tags/field_integer_test.rb +6 -0
- data/test/unit/tags/field_rich_text_test.rb +6 -0
- data/test/unit/tags/field_string_test.rb +6 -0
- data/test/unit/tags/field_text_test.rb +6 -0
- data/test/unit/tags/page_datetime_test.rb +6 -0
- data/test/unit/tags/page_file_test.rb +10 -2
- data/test/unit/tags/page_files_test.rb +9 -1
- data/test/unit/tags/page_integer_test.rb +6 -0
- data/test/unit/tags/page_rich_text_test.rb +6 -0
- data/test/unit/tags/page_string_test.rb +6 -0
- data/test/unit/tags/page_text_test.rb +6 -0
- data/test/unit/view_methods_test.rb +21 -3
- metadata +5 -4
data/test/unit/tag_test.rb
CHANGED
@@ -183,7 +183,7 @@ class TagTest < ActiveSupport::TestCase
|
|
183
183
|
def test_content_with_cyclical_tags
|
184
184
|
page = cms_pages(:default)
|
185
185
|
snippet = cms_snippets(:default)
|
186
|
-
snippet.
|
186
|
+
snippet.update_attributes(:content => "infinite {{cms:page:default}} loop")
|
187
187
|
assert_equal rendered_content_formatter(
|
188
188
|
'
|
189
189
|
layout_content_a
|
@@ -274,4 +274,30 @@ class TagTest < ActiveSupport::TestCase
|
|
274
274
|
assert_equal %{<%= h('\\'+User.first.inspect+\\'') %>}, tag.render
|
275
275
|
end
|
276
276
|
|
277
|
+
def test_tag_initialization_with_namespace
|
278
|
+
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
279
|
+
cms_pages(:default), '{{ cms:page:content:string }}'
|
280
|
+
)
|
281
|
+
assert_equal 'content', tag.identifier
|
282
|
+
assert_equal nil, tag.namespace
|
283
|
+
|
284
|
+
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
285
|
+
cms_pages(:default), '{{ cms:page:home.content:string }}'
|
286
|
+
)
|
287
|
+
assert_equal 'home.content', tag.identifier
|
288
|
+
assert_equal 'home', tag.namespace
|
289
|
+
|
290
|
+
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
291
|
+
cms_pages(:default), '{{ cms:page:home.main.content:string }}'
|
292
|
+
)
|
293
|
+
assert_equal 'home.main.content', tag.identifier
|
294
|
+
assert_equal 'home.main', tag.namespace
|
295
|
+
|
296
|
+
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
297
|
+
cms_pages(:default), '{{ cms:page:ho-me.ma-in.con-tent:string }}'
|
298
|
+
)
|
299
|
+
assert_equal 'ho-me.ma-in.con-tent', tag.identifier
|
300
|
+
assert_equal 'ho-me.ma-in', tag.namespace
|
301
|
+
end
|
302
|
+
|
277
303
|
end
|
@@ -14,11 +14,18 @@ class CollectionTagTest < ActiveSupport::TestCase
|
|
14
14
|
cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
|
15
15
|
)
|
16
16
|
assert_equal 'snippet', tag.identifier
|
17
|
+
assert_nil tag.namespace
|
17
18
|
assert_equal 'Cms::Snippet', tag.collection_class
|
18
19
|
assert_equal 'partials/cms/snippets', tag.collection_partial
|
19
20
|
assert_equal 'label', tag.collection_title
|
20
21
|
assert_equal 'id', tag.collection_identifier
|
21
22
|
assert_equal [], tag.collection_params
|
23
|
+
|
24
|
+
assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
|
25
|
+
cms_pages(:default), '{{ cms:collection:namespace.snippet:cms/snippet }}'
|
26
|
+
)
|
27
|
+
assert_equal 'namespace.snippet', tag.identifier
|
28
|
+
assert_equal 'namespace', tag.namespace
|
22
29
|
end
|
23
30
|
|
24
31
|
def test_initialize_tag_detailed
|
@@ -7,6 +7,7 @@ class FieldDateTimeTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:field:content:datetime }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:field:content:datetime}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class FieldDateTimeTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:field:dash-content:datetime}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:field:namespace.content:datetime}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class FieldIntegerTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:field:content:integer }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:field:content:integer}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class FieldIntegerTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:field:dash-content:integer}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:field:namespace.content:integer}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class FieldRichTextTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:field:content:rich_text }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:field:content:rich_text}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class FieldRichTextTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:field:dash-content:rich_text}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:field:namespace.content:rich_text}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class FieldStringTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:field:content:string }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:field:content:string}}'
|
12
13
|
)
|
@@ -19,6 +20,11 @@ class FieldStringTagTest < ActiveSupport::TestCase
|
|
19
20
|
cms_pages(:default), '{{cms:field:dash-content}}'
|
20
21
|
)
|
21
22
|
assert_equal 'dash-content', tag.identifier
|
23
|
+
assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
|
24
|
+
cms_pages(:default), '{{cms:field:namespace.content}}'
|
25
|
+
)
|
26
|
+
assert_equal 'namespace.content', tag.identifier
|
27
|
+
assert_equal 'namespace', tag.namespace
|
22
28
|
end
|
23
29
|
|
24
30
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class FieldTextTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:field:content:text }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:field:content:text}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class FieldTextTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:field:dash-content:text}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:field:namespace.content:text}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page:content:datetime }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:page:content:datetime}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:page:dash-content:datetime}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:page:namespace.content:datetime}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -6,13 +6,21 @@ class PageFileTagTest < ActiveSupport::TestCase
|
|
6
6
|
assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
|
7
7
|
cms_pages(:default), '{{ cms:page_file:label }}'
|
8
8
|
)
|
9
|
+
assert_equal 'label', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
9
11
|
assert 'url', tag.type
|
10
12
|
assert_equal nil, tag.dimensions
|
11
13
|
|
12
14
|
assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
|
13
15
|
cms_pages(:default), '{{ cms:page_file:label:partial }}'
|
14
16
|
)
|
15
|
-
|
17
|
+
assert_equal 'partial', tag.type
|
18
|
+
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
|
20
|
+
cms_pages(:default), '{{ cms:page_file:namespace.label:partial }}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.label', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
16
24
|
end
|
17
25
|
|
18
26
|
def test_initialize_tag_with_dimentions
|
@@ -90,7 +98,7 @@ class PageFileTagTest < ActiveSupport::TestCase
|
|
90
98
|
|
91
99
|
def test_content_and_render_with_dimentions
|
92
100
|
layout = cms_layouts(:default)
|
93
|
-
layout.
|
101
|
+
layout.update_attributes(:content => '{{ cms:page_file:file:image[10x10#] }}')
|
94
102
|
page = cms_pages(:default)
|
95
103
|
upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
|
96
104
|
|
@@ -7,12 +7,20 @@ class PageFilesTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page_files:label }}'
|
8
8
|
)
|
9
9
|
assert 'url', tag.type
|
10
|
+
assert_equal 'label', tag.identifier
|
11
|
+
assert_equal nil, tag.namespace
|
10
12
|
assert_equal nil, tag.dimensions
|
11
13
|
|
12
14
|
assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
|
13
15
|
cms_pages(:default), '{{ cms:page_files:label:partial }}'
|
14
16
|
)
|
15
17
|
assert 'partial', tag.type
|
18
|
+
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
|
20
|
+
cms_pages(:default), '{{ cms:page_files:namespace.label:partial }}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.label', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
16
24
|
end
|
17
25
|
|
18
26
|
def test_initialize_tag_with_dimentions
|
@@ -83,7 +91,7 @@ class PageFilesTagTest < ActiveSupport::TestCase
|
|
83
91
|
|
84
92
|
def test_content_and_render_with_dimentions
|
85
93
|
layout = cms_layouts(:default)
|
86
|
-
layout.
|
94
|
+
layout.update_attributes(:content => '{{ cms:page_files:file:image[10x10#] }}')
|
87
95
|
page = cms_pages(:default)
|
88
96
|
upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
|
89
97
|
|
@@ -7,6 +7,7 @@ class PageIntegerTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page:content:integer }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:page:content:integer}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class PageIntegerTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:page:dash-content:integer}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:page:namespace.content:integer}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class PageRichTextTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page:content:rich_text }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:page:content:rich_text}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class PageRichTextTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:page:dash-content:rich_text}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:page:namespace.content:rich_text}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class PageStringTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page:content:string }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:page:content:string}}'
|
12
13
|
)
|
@@ -15,6 +16,11 @@ class PageStringTagTest < ActiveSupport::TestCase
|
|
15
16
|
cms_pages(:default), '{{cms:page:dash-content:string}}'
|
16
17
|
)
|
17
18
|
assert_equal 'dash-content', tag.identifier
|
19
|
+
assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
|
20
|
+
cms_pages(:default), '{{cms:page:namespace.content:string}}'
|
21
|
+
)
|
22
|
+
assert_equal 'namespace.content', tag.identifier
|
23
|
+
assert_equal 'namespace', tag.namespace
|
18
24
|
end
|
19
25
|
|
20
26
|
def test_initialize_tag_failure
|
@@ -7,6 +7,7 @@ class PageTextTagTest < ActiveSupport::TestCase
|
|
7
7
|
cms_pages(:default), '{{ cms:page:content:text }}'
|
8
8
|
)
|
9
9
|
assert_equal 'content', tag.identifier
|
10
|
+
assert_nil tag.namespace
|
10
11
|
assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
|
11
12
|
cms_pages(:default), '{{cms:page:content}}'
|
12
13
|
)
|
@@ -19,6 +20,11 @@ class PageTextTagTest < ActiveSupport::TestCase
|
|
19
20
|
cms_pages(:default), '{{cms:page:dash-content}}'
|
20
21
|
)
|
21
22
|
assert_equal 'dash-content', tag.identifier
|
23
|
+
assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
|
24
|
+
cms_pages(:default), '{{cms:page:namespace.content}}'
|
25
|
+
)
|
26
|
+
assert_equal 'namespace.content', tag.identifier
|
27
|
+
assert_equal 'namespace', tag.namespace
|
22
28
|
end
|
23
29
|
|
24
30
|
def test_initialize_tag_failure
|
@@ -2,6 +2,8 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
|
|
2
2
|
|
3
3
|
class ViewMethodsTest < ActionView::TestCase
|
4
4
|
|
5
|
+
include ComfortableMexicanSofa::ViewMethods
|
6
|
+
|
5
7
|
class ::HelpersTestController < ActionController::Base
|
6
8
|
helper { def hello; 'hello' end }
|
7
9
|
def test_cms_snippet_content
|
@@ -23,12 +25,12 @@ class ViewMethodsTest < ActionView::TestCase
|
|
23
25
|
end
|
24
26
|
|
25
27
|
def test_cms_snippet_content_with_tags
|
26
|
-
cms_snippets(:default).
|
28
|
+
cms_snippets(:default).update_column(:content, '{{cms:helper:hello}}')
|
27
29
|
assert_equal 'hello', action_result('test_cms_snippet_content')
|
28
30
|
end
|
29
31
|
|
30
32
|
def test_cms_snippet_content_with_file_tag
|
31
|
-
cms_snippets(:default).
|
33
|
+
cms_snippets(:default).update_column(:content, '{{cms:file:sample.jpg}}')
|
32
34
|
assert_equal cms_files(:default).file.url, action_result('test_cms_snippet_content')
|
33
35
|
end
|
34
36
|
|
@@ -37,8 +39,24 @@ class ViewMethodsTest < ActionView::TestCase
|
|
37
39
|
end
|
38
40
|
|
39
41
|
def test_cms_page_content_with_tags
|
40
|
-
cms_blocks(:default_field_text).
|
42
|
+
cms_blocks(:default_field_text).update_column(:content, '{{cms:helper:hello}}')
|
41
43
|
assert_equal 'hello', action_result('test_cms_page_content')
|
42
44
|
end
|
43
45
|
|
46
|
+
def test_cms_page_content_with_files
|
47
|
+
page = cms_pages(:default)
|
48
|
+
page.layout.update_column(:content, '{{cms:page_file:file}} {{cms:page_files:files}}')
|
49
|
+
page.update_attributes!(
|
50
|
+
:blocks_attributes => [
|
51
|
+
{ :identifier => 'file',
|
52
|
+
:content => fixture_file_upload('files/image.jpg', "image/jpeg") },
|
53
|
+
{ :identifier => 'files',
|
54
|
+
:content => [fixture_file_upload('files/image.jpg', "image/jpeg"),
|
55
|
+
fixture_file_upload('files/image.gif', "image/gif")] }
|
56
|
+
]
|
57
|
+
)
|
58
|
+
assert_equal page.blocks.find_by_identifier('file').files.first, cms_page_content(:file, page)
|
59
|
+
assert_equal page.blocks.find_by_identifier('files').files, cms_page_content(:files, page)
|
60
|
+
end
|
61
|
+
|
44
62
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comfortable_mexican_sofa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.24
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-
|
13
|
+
date: 2012-08-09 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rails
|
@@ -229,6 +229,7 @@ files:
|
|
229
229
|
- config/locales/es.yml
|
230
230
|
- config/locales/ja.yml
|
231
231
|
- config/locales/pt-BR.yml
|
232
|
+
- config/locales/ru.yml
|
232
233
|
- config/locales/sv.yml
|
233
234
|
- config/locales/zh-CN.yml
|
234
235
|
- config/routes.rb
|
@@ -385,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
385
386
|
version: '0'
|
386
387
|
segments:
|
387
388
|
- 0
|
388
|
-
hash:
|
389
|
+
hash: 2960063838234964061
|
389
390
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
390
391
|
none: false
|
391
392
|
requirements:
|
@@ -394,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
394
395
|
version: '0'
|
395
396
|
requirements: []
|
396
397
|
rubyforge_project:
|
397
|
-
rubygems_version: 1.8.
|
398
|
+
rubygems_version: 1.8.23
|
398
399
|
signing_key:
|
399
400
|
specification_version: 3
|
400
401
|
summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications
|