comfortable_mexican_sofa 2.0.2 → 2.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +95 -4
- data/.travis.yml +2 -1
- data/CONTRIBUTING.md +8 -5
- data/Gemfile +9 -9
- data/Rakefile +1 -1
- data/app/assets/javascripts/comfy/admin/cms/base.js.coffee +1 -0
- data/app/assets/stylesheets/comfy/admin/cms/base.sass +14 -4
- data/app/controllers/application_controller.rb +2 -2
- data/app/controllers/comfy/admin/base_controller.rb +1 -1
- data/app/controllers/comfy/admin/cms/base_controller.rb +7 -6
- data/app/controllers/comfy/admin/cms/categories_controller.rb +2 -1
- data/app/controllers/comfy/admin/cms/files_controller.rb +32 -29
- data/app/controllers/comfy/admin/cms/layouts_controller.rb +10 -9
- data/app/controllers/comfy/admin/cms/pages_controller.rb +31 -27
- data/app/controllers/comfy/admin/cms/revisions/base_controller.rb +5 -4
- data/app/controllers/comfy/admin/cms/revisions/layout_controller.rb +2 -1
- data/app/controllers/comfy/admin/cms/revisions/page_controller.rb +9 -3
- data/app/controllers/comfy/admin/cms/revisions/snippet_controller.rb +2 -1
- data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb +9 -3
- data/app/controllers/comfy/admin/cms/sites_controller.rb +10 -9
- data/app/controllers/comfy/admin/cms/snippets_controller.rb +10 -9
- data/app/controllers/comfy/admin/cms/translations_controller.rb +15 -14
- data/app/controllers/comfy/cms/assets_controller.rb +4 -3
- data/app/controllers/comfy/cms/base_controller.rb +12 -11
- data/app/controllers/comfy/cms/content_controller.rb +8 -7
- data/app/controllers/concerns/comfy/paginate.rb +2 -1
- data/app/helpers/comfy/cms_helper.rb +6 -3
- data/app/models/comfy/cms/categorization.rb +2 -1
- data/app/models/comfy/cms/category.rb +3 -2
- data/app/models/comfy/cms/file.rb +9 -7
- data/app/models/comfy/cms/fragment.rb +8 -6
- data/app/models/comfy/cms/layout.rb +24 -24
- data/app/models/comfy/cms/page.rb +51 -32
- data/app/models/comfy/cms/revision.rb +2 -1
- data/app/models/comfy/cms/site.rb +27 -26
- data/app/models/comfy/cms/snippet.rb +7 -5
- data/app/models/comfy/cms/translation.rb +6 -4
- data/app/models/concerns/comfy/cms/with_categories.rb +9 -7
- data/app/models/concerns/comfy/cms/with_fragments.rb +15 -13
- data/app/views/comfy/admin/cms/categories/_categories.html.haml +1 -1
- data/app/views/comfy/admin/cms/files/_file.html.haml +3 -3
- data/app/views/comfy/admin/cms/files/_modal.html.haml +2 -2
- data/app/views/comfy/admin/cms/{pages/_fragment_attachments.html.haml → fragments/_form_fragment_attachments.html.haml} +0 -0
- data/app/views/comfy/admin/cms/{pages → fragments}/_form_fragments.html.haml +0 -0
- data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml +2 -2
- data/app/views/comfy/admin/cms/pages/_form.html.haml +7 -7
- data/app/views/comfy/admin/cms/pages/_index_branch.html.haml +16 -15
- data/app/views/comfy/admin/cms/pages/form_fragments.js.erb +1 -1
- data/app/views/comfy/admin/cms/pages/toggle_branch.js.erb +1 -1
- data/app/views/comfy/admin/cms/snippets/index.html.haml +3 -3
- data/app/views/comfy/admin/cms/translations/_form.html.haml +1 -1
- data/app/views/comfy/admin/cms/translations/form_fragments.js.erb +1 -1
- data/app/views/layouts/comfy/admin/cms/_body.html.haml +1 -4
- data/app/views/layouts/comfy/admin/cms.html.haml +1 -1
- data/bin/bundle +3 -0
- data/bin/rails +4 -0
- data/bin/rake +4 -0
- data/bin/setup +36 -0
- data/bin/update +31 -0
- data/bin/yarn +11 -0
- data/comfortable_mexican_sofa.gemspec +14 -14
- data/config/application.rb +4 -3
- data/config/boot.rb +3 -3
- data/config/cms_routes.rb +1 -1
- data/config/environment.rb +1 -1
- data/config/environments/development.rb +2 -2
- data/config/environments/test.rb +1 -1
- data/config/initializers/comfortable_mexican_sofa.rb +2 -5
- data/config/locales/cs.yml +2 -1
- data/config/locales/da.yml +2 -1
- data/config/locales/de.yml +2 -1
- data/config/locales/en.yml +2 -1
- data/config/locales/es.yml +2 -1
- data/config/locales/fr.yml +2 -1
- data/config/locales/it.yml +2 -1
- data/config/locales/ja.yml +2 -1
- data/config/locales/nb.yml +2 -1
- data/config/locales/nl.yml +2 -1
- data/config/locales/pl.yml +2 -1
- data/config/locales/pt-BR.yml +2 -1
- data/config/locales/ru.yml +2 -1
- data/config/locales/sk.yml +2 -1
- data/config/locales/sv.yml +2 -1
- data/config/locales/tr.yml +2 -1
- data/config/locales/uk.yml +2 -1
- data/config/locales/zh-CN.yml +2 -1
- data/config/locales/zh-TW.yml +2 -1
- data/config.ru +1 -1
- data/lib/comfortable_mexican_sofa/access_control/admin_authentication.rb +2 -1
- data/lib/comfortable_mexican_sofa/access_control/admin_authorization.rb +2 -0
- data/lib/comfortable_mexican_sofa/access_control/public_authentication.rb +3 -1
- data/lib/comfortable_mexican_sofa/access_control/public_authorization.rb +2 -0
- data/lib/comfortable_mexican_sofa/configuration.rb +27 -29
- data/lib/comfortable_mexican_sofa/content/block.rb +2 -1
- data/lib/comfortable_mexican_sofa/content/params_parser.rb +22 -21
- data/lib/comfortable_mexican_sofa/content/renderer.rb +10 -8
- data/lib/comfortable_mexican_sofa/content/tag.rb +1 -0
- data/lib/comfortable_mexican_sofa/content/tags/asset.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/checkbox.rb +3 -2
- data/lib/comfortable_mexican_sofa/content/tags/date.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/datetime.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/file.rb +15 -13
- data/lib/comfortable_mexican_sofa/content/tags/file_link.rb +8 -7
- data/lib/comfortable_mexican_sofa/content/tags/files.rb +15 -13
- data/lib/comfortable_mexican_sofa/content/tags/fragment.rb +7 -6
- data/lib/comfortable_mexican_sofa/content/tags/helper.rb +2 -1
- data/lib/comfortable_mexican_sofa/content/tags/markdown.rb +5 -4
- data/lib/comfortable_mexican_sofa/content/tags/number.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/partial.rb +1 -0
- data/lib/comfortable_mexican_sofa/content/tags/snippet.rb +3 -2
- data/lib/comfortable_mexican_sofa/content/tags/template.rb +1 -0
- data/lib/comfortable_mexican_sofa/content/tags/text.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/textarea.rb +4 -3
- data/lib/comfortable_mexican_sofa/content/tags/wysiwyg.rb +4 -3
- data/lib/comfortable_mexican_sofa/content.rb +21 -21
- data/lib/comfortable_mexican_sofa/engine.rb +17 -15
- data/lib/comfortable_mexican_sofa/error.rb +12 -6
- data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb +17 -11
- data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb +14 -13
- data/lib/comfortable_mexican_sofa/form_builder.rb +2 -2
- data/lib/comfortable_mexican_sofa/render_methods.rb +74 -76
- data/lib/comfortable_mexican_sofa/routes/cms.rb +4 -4
- data/lib/comfortable_mexican_sofa/routes/cms_admin.rb +2 -1
- data/lib/comfortable_mexican_sofa/routing.rb +4 -2
- data/lib/comfortable_mexican_sofa/seeds/file/exporter.rb +7 -6
- data/lib/comfortable_mexican_sofa/seeds/file/importer.rb +9 -9
- data/lib/comfortable_mexican_sofa/seeds/layout/exporter.rb +8 -7
- data/lib/comfortable_mexican_sofa/seeds/layout/importer.rb +11 -10
- data/lib/comfortable_mexican_sofa/seeds/page/exporter.rb +25 -23
- data/lib/comfortable_mexican_sofa/seeds/page/importer.rb +47 -43
- data/lib/comfortable_mexican_sofa/seeds/snippet/exporter.rb +7 -6
- data/lib/comfortable_mexican_sofa/seeds/snippet/importer.rb +7 -6
- data/lib/comfortable_mexican_sofa/seeds.rb +16 -9
- data/lib/comfortable_mexican_sofa/version.rb +4 -2
- data/lib/comfortable_mexican_sofa/view_hooks.rb +10 -9
- data/lib/comfortable_mexican_sofa.rb +30 -30
- data/lib/generators/comfy/cms/assets_generator.rb +6 -4
- data/lib/generators/comfy/cms/cms_generator.rb +14 -14
- data/lib/generators/comfy/cms/controllers_generator.rb +5 -3
- data/lib/generators/comfy/cms/models_generator.rb +5 -3
- data/lib/generators/comfy/cms/views_generator.rb +5 -3
- data/lib/generators/comfy/scaffold/scaffold_generator.rb +19 -18
- data/lib/tasks/cms_seeds.rake +4 -5
- data/test/controllers/comfy/admin/cms/base_controller_test.rb +4 -3
- data/test/controllers/comfy/admin/cms/categories_controller_test.rb +19 -18
- data/test/controllers/comfy/admin/cms/files_controller_test.rb +19 -19
- data/test/controllers/comfy/admin/cms/layouts_controller_test.rb +33 -32
- data/test/controllers/comfy/admin/cms/pages_controller_test.rb +99 -98
- data/test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb +9 -9
- data/test/controllers/comfy/admin/cms/revisions/page_controller_test.rb +6 -6
- data/test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb +9 -8
- data/test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb +6 -7
- data/test/controllers/comfy/admin/cms/sites_controller_test.rb +31 -30
- data/test/controllers/comfy/admin/cms/snippets_controller_test.rb +38 -37
- data/test/controllers/comfy/admin/cms/translations_controller_test.rb +21 -20
- data/test/controllers/comfy/cms/assets_controller_test.rb +14 -13
- data/test/controllers/comfy/cms/content_controller_test.rb +58 -57
- data/test/gemfiles/Gemfile.rails.5.2 +5 -4
- data/test/generators/cms_assets_generator_test.rb +6 -4
- data/test/generators/cms_controllers_generator_test.rb +7 -5
- data/test/generators/cms_generator_test.rb +12 -10
- data/test/generators/cms_models_generator_test.rb +7 -5
- data/test/generators/cms_views_generator_test.rb +6 -4
- data/test/generators/scaffold_generator_test.rb +18 -16
- data/test/helpers/cms_helper_test.rb +5 -2
- data/test/integration/access_control_test.rb +29 -20
- data/test/integration/i18n_test.rb +8 -7
- data/test/integration/js_variables_test.rb +2 -1
- data/test/integration/render_cms_test.rb +93 -88
- data/test/integration/routing_test.rb +4 -3
- data/test/integration/seeds_test.rb +21 -22
- data/test/integration/sites_test.rb +26 -25
- data/test/integration/view_hooks_test.rb +15 -14
- data/test/lib/configuration_test.rb +13 -15
- data/test/lib/content/block_test.rb +1 -1
- data/test/lib/content/params_parser_test.rb +11 -10
- data/test/lib/content/renderer_test.rb +16 -11
- data/test/lib/content/tag_test.rb +7 -3
- data/test/lib/content/tags/asset_test.rb +4 -3
- data/test/lib/content/tags/checkbox_test.rb +2 -1
- data/test/lib/content/tags/date_test.rb +2 -1
- data/test/lib/content/tags/datetime_test.rb +2 -1
- data/test/lib/content/tags/file_link_test.rb +3 -2
- data/test/lib/content/tags/file_test.rb +3 -2
- data/test/lib/content/tags/files_test.rb +4 -3
- data/test/lib/content/tags/fragment_test.rb +2 -1
- data/test/lib/content/tags/helper_test.rb +4 -3
- data/test/lib/content/tags/markdown_test.rb +2 -1
- data/test/lib/content/tags/number_test.rb +2 -1
- data/test/lib/content/tags/partial_test.rb +4 -3
- data/test/lib/content/tags/snippet_test.rb +2 -1
- data/test/lib/content/tags/template_test.rb +2 -1
- data/test/lib/content/tags/text_test.rb +2 -1
- data/test/lib/content/tags/textarea_test.rb +2 -1
- data/test/lib/content/tags/wysiwyg_test.rb +2 -1
- data/test/lib/revisions_test.rb +44 -42
- data/test/lib/seeds/files_test.rb +30 -29
- data/test/lib/seeds/layouts_test.rb +13 -12
- data/test/lib/seeds/pages_test.rb +32 -29
- data/test/lib/seeds/snippets_test.rb +21 -20
- data/test/lib/seeds_test.rb +9 -8
- data/test/models/categorization_test.rb +10 -9
- data/test/models/category_test.rb +1 -1
- data/test/models/file_test.rb +1 -1
- data/test/models/fragment_test.rb +11 -10
- data/test/models/layout_test.rb +71 -70
- data/test/models/page_test.rb +170 -159
- data/test/models/site_test.rb +17 -16
- data/test/models/snippet_test.rb +1 -0
- data/test/models/translation_test.rb +2 -1
- data/test/tasks/cms_seeds_test.rb +3 -2
- data/test/test_helper.rb +42 -40
- metadata +55 -51
- data/.rubocop_todo.yml +0 -974
- data/script/rails +0 -6
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../../../../test_helper"
|
2
2
|
|
3
3
|
class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
|
4
4
|
|
@@ -21,7 +21,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
|
|
21
21
|
r :get, new_comfy_admin_cms_site_layout_path(site_id: site)
|
22
22
|
assert_response :success
|
23
23
|
assert assigns(:layout)
|
24
|
-
assert_equal
|
24
|
+
assert_equal "{{ cms:wysiwyg content }}", assigns(:layout).content
|
25
25
|
assert_template :new
|
26
26
|
assert_select "form[action='/admin/sites/#{site.id}/layouts']"
|
27
27
|
end
|
@@ -29,8 +29,8 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
|
|
29
29
|
def test_get_new_with_parent
|
30
30
|
site = comfy_cms_sites(:default)
|
31
31
|
layout = comfy_cms_layouts(:default)
|
32
|
-
layout.update_column(:app_layout,
|
33
|
-
r :get, new_comfy_admin_cms_site_layout_path(site_id: site), params: {parent_id: layout.id}
|
32
|
+
layout.update_column(:app_layout, "application")
|
33
|
+
r :get, new_comfy_admin_cms_site_layout_path(site_id: site), params: { parent_id: layout.id }
|
34
34
|
assert_response :success
|
35
35
|
assert_equal layout.app_layout, assigns(:layout).app_layout
|
36
36
|
end
|
@@ -45,76 +45,76 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
|
|
45
45
|
end
|
46
46
|
|
47
47
|
def test_get_edit_failure
|
48
|
-
r :get, edit_comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id:
|
48
|
+
r :get, edit_comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: "invalid")
|
49
49
|
assert_response :redirect
|
50
50
|
assert_redirected_to action: :index
|
51
|
-
assert_equal
|
51
|
+
assert_equal "Layout not found", flash[:danger]
|
52
52
|
end
|
53
53
|
|
54
54
|
def test_creation
|
55
|
-
assert_difference
|
56
|
-
r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: {layout: {
|
57
|
-
label:
|
58
|
-
identifier:
|
59
|
-
content:
|
60
|
-
}}
|
55
|
+
assert_difference "Comfy::Cms::Layout.count" do
|
56
|
+
r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: { layout: {
|
57
|
+
label: "Test Layout",
|
58
|
+
identifier: "test",
|
59
|
+
content: "Test {{cms:page:content}}"
|
60
|
+
} }
|
61
61
|
assert_response :redirect
|
62
62
|
layout = Comfy::Cms::Layout.last
|
63
63
|
assert_equal comfy_cms_sites(:default), layout.site
|
64
64
|
assert_redirected_to action: :edit, site_id: layout.site, id: layout
|
65
|
-
assert_equal
|
65
|
+
assert_equal "Layout created", flash[:success]
|
66
66
|
end
|
67
67
|
end
|
68
68
|
|
69
69
|
def test_creation_failure
|
70
|
-
assert_no_difference
|
71
|
-
r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: {layout: {}}
|
70
|
+
assert_no_difference "Comfy::Cms::Layout.count" do
|
71
|
+
r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: { layout: {} }
|
72
72
|
assert_response :success
|
73
73
|
assert_template :new
|
74
|
-
assert_equal
|
74
|
+
assert_equal "Failed to create layout", flash[:danger]
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
78
78
|
def test_update
|
79
79
|
layout = comfy_cms_layouts(:default)
|
80
|
-
r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: {layout: {
|
81
|
-
label:
|
82
|
-
content:
|
83
|
-
}}
|
80
|
+
r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: { layout: {
|
81
|
+
label: "New Label",
|
82
|
+
content: "New {{cms:page:content}}"
|
83
|
+
} }
|
84
84
|
assert_response :redirect
|
85
85
|
assert_redirected_to action: :edit, site_id: layout.site, id: layout
|
86
|
-
assert_equal
|
86
|
+
assert_equal "Layout updated", flash[:success]
|
87
87
|
layout.reload
|
88
|
-
assert_equal
|
89
|
-
assert_equal
|
88
|
+
assert_equal "New Label", layout.label
|
89
|
+
assert_equal "New {{cms:page:content}}", layout.content
|
90
90
|
end
|
91
91
|
|
92
92
|
def test_update_failure
|
93
93
|
layout = comfy_cms_layouts(:default)
|
94
|
-
r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: {layout: {
|
95
|
-
identifier:
|
96
|
-
}}
|
94
|
+
r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: { layout: {
|
95
|
+
identifier: ""
|
96
|
+
} }
|
97
97
|
assert_response :success
|
98
98
|
assert_template :edit
|
99
99
|
layout.reload
|
100
|
-
assert_not_equal
|
101
|
-
assert_equal
|
100
|
+
assert_not_equal "", layout.identifier
|
101
|
+
assert_equal "Failed to update layout", flash[:danger]
|
102
102
|
end
|
103
103
|
|
104
104
|
def test_destroy
|
105
|
-
assert_difference
|
105
|
+
assert_difference "Comfy::Cms::Layout.count", -1 do
|
106
106
|
r :delete, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: comfy_cms_layouts(:default))
|
107
107
|
assert_response :redirect
|
108
108
|
assert_redirected_to action: :index
|
109
|
-
assert_equal
|
109
|
+
assert_equal "Layout deleted", flash[:success]
|
110
110
|
end
|
111
111
|
end
|
112
112
|
|
113
113
|
def test_reorder
|
114
114
|
layout_one = comfy_cms_layouts(:default)
|
115
115
|
layout_two = comfy_cms_sites(:default).layouts.create!(
|
116
|
-
label:
|
117
|
-
identifier:
|
116
|
+
label: "test",
|
117
|
+
identifier: "test"
|
118
118
|
)
|
119
119
|
assert_equal 0, layout_one.position
|
120
120
|
assert_equal 1, layout_two.position
|
@@ -129,4 +129,5 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
|
|
129
129
|
assert_equal 1, layout_one.position
|
130
130
|
assert_equal 0, layout_two.position
|
131
131
|
end
|
132
|
+
|
132
133
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../../../../test_helper"
|
2
2
|
|
3
3
|
class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
4
4
|
|
@@ -24,12 +24,12 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
24
24
|
|
25
25
|
def test_get_index_with_category
|
26
26
|
category = @site.categories.create!(
|
27
|
-
label:
|
28
|
-
categorized_type:
|
27
|
+
label: "Test Category",
|
28
|
+
categorized_type: "Comfy::Cms::Page"
|
29
29
|
)
|
30
30
|
category.categorizations.create!(categorized: comfy_cms_pages(:child))
|
31
31
|
|
32
|
-
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {categories: category.label}
|
32
|
+
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: { categories: category.label }
|
33
33
|
assert_response :success
|
34
34
|
assert assigns(:pages)
|
35
35
|
assert_equal 1, assigns(:pages).count
|
@@ -37,7 +37,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
37
37
|
end
|
38
38
|
|
39
39
|
def test_get_index_with_category_invalid
|
40
|
-
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {categories: "invalid"}
|
40
|
+
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: { categories: "invalid" }
|
41
41
|
assert_response :success
|
42
42
|
assert assigns(:pages)
|
43
43
|
assert_equal 0, assigns(:pages).count
|
@@ -45,8 +45,8 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
45
45
|
|
46
46
|
def test_get_index_with_toggle
|
47
47
|
@site.pages.create!(
|
48
|
-
label:
|
49
|
-
slug:
|
48
|
+
label: "test",
|
49
|
+
slug: "test",
|
50
50
|
parent: comfy_cms_pages(:child),
|
51
51
|
layout: comfy_cms_layouts(:default)
|
52
52
|
)
|
@@ -55,13 +55,13 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
55
55
|
end
|
56
56
|
|
57
57
|
def test_get_links_with_redactor
|
58
|
-
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {source:
|
58
|
+
r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: { source: "redactor" }
|
59
59
|
assert_response :success
|
60
60
|
|
61
61
|
assert_equal [
|
62
|
-
{
|
63
|
-
{
|
64
|
-
{
|
62
|
+
{ "name" => "Select page...", "url" => false },
|
63
|
+
{ "name" => "Default Page", "url" => "/" },
|
64
|
+
{ "name" => ". . Child Page", "url" => "/child-page" }
|
65
65
|
], JSON.parse(response.body)
|
66
66
|
end
|
67
67
|
|
@@ -220,11 +220,12 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
220
220
|
end
|
221
221
|
|
222
222
|
def test_get_new_with_localized_names
|
223
|
-
I18n.backend.store_translations(:en,
|
224
|
-
tag: {localized_a: "Localized Fragment"},
|
225
|
-
|
226
|
-
}}
|
227
|
-
@layout.update_column(
|
223
|
+
I18n.backend.store_translations(:en, comfy: { cms: { content:
|
224
|
+
{ tag: { localized_a: "Localized Fragment" },
|
225
|
+
namespace: { localized_a: "Localized Namespace" } }
|
226
|
+
} })
|
227
|
+
@layout.update_column(
|
228
|
+
:content,
|
228
229
|
"{{cms:text localized_a, namespace: localized_a}}{{cms:text b, namespace: b}}"
|
229
230
|
)
|
230
231
|
r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
|
@@ -232,15 +233,14 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
232
233
|
|
233
234
|
assert_select "a[data-toggle='tab'][href='#ns-localized_a']", "Localized Namespace"
|
234
235
|
assert_select "label", "Localized Fragment"
|
235
|
-
|
236
236
|
ensure
|
237
|
-
I18n.backend.store_translations(:en,
|
238
|
-
tag: nil, namespace:
|
239
|
-
}}
|
237
|
+
I18n.backend.store_translations(:en, comfy: { cms: { content:
|
238
|
+
{ tag: nil, namespace: nil }
|
239
|
+
} })
|
240
240
|
end
|
241
241
|
|
242
242
|
def test_get_new_as_child_page
|
243
|
-
r :get, new_comfy_admin_cms_site_page_path(site_id: @site), params: {parent_id: @page}
|
243
|
+
r :get, new_comfy_admin_cms_site_page_path(site_id: @site), params: { parent_id: @page }
|
244
244
|
assert_response :success
|
245
245
|
assert assigns(:page)
|
246
246
|
assert_equal comfy_cms_pages(:default), assigns(:page).parent
|
@@ -257,10 +257,10 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
257
257
|
end
|
258
258
|
|
259
259
|
def test_get_edit_failure
|
260
|
-
r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id:
|
260
|
+
r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: "not_found")
|
261
261
|
assert_response :redirect
|
262
262
|
assert_redirected_to action: :index
|
263
|
-
assert_equal
|
263
|
+
assert_equal "Page not found", flash[:danger]
|
264
264
|
end
|
265
265
|
|
266
266
|
def test_get_edit_with_blank_layout
|
@@ -283,34 +283,34 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
283
283
|
end
|
284
284
|
|
285
285
|
def test_creation
|
286
|
-
assert_difference
|
287
|
-
assert_difference
|
286
|
+
assert_difference "Comfy::Cms::Page.count" do
|
287
|
+
assert_difference "Comfy::Cms::Fragment.count", 2 do
|
288
288
|
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
|
289
289
|
page: {
|
290
|
-
label:
|
291
|
-
slug:
|
290
|
+
label: "Test Page",
|
291
|
+
slug: "test-page",
|
292
292
|
parent_id: @page.id,
|
293
293
|
layout_id: @layout.id,
|
294
294
|
fragments_attributes: [
|
295
|
-
{ identifier:
|
296
|
-
content:
|
297
|
-
{ identifier:
|
298
|
-
content:
|
295
|
+
{ identifier: "default_page_text",
|
296
|
+
content: "content content" },
|
297
|
+
{ identifier: "default_field_text",
|
298
|
+
content: "title content" }
|
299
299
|
]
|
300
300
|
},
|
301
|
-
commit:
|
301
|
+
commit: "Create Page"
|
302
302
|
}
|
303
303
|
assert_response :redirect
|
304
304
|
page = Comfy::Cms::Page.last
|
305
305
|
assert_equal @site, page.site
|
306
306
|
assert_redirected_to action: :edit, id: page
|
307
|
-
assert_equal
|
307
|
+
assert_equal "Page created", flash[:success]
|
308
308
|
end
|
309
309
|
end
|
310
310
|
end
|
311
311
|
|
312
312
|
def test_creation_with_files
|
313
|
-
assert_difference
|
313
|
+
assert_difference "Comfy::Cms::Page.count" do
|
314
314
|
assert_difference "Comfy::Cms::Fragment.count", 3 do
|
315
315
|
assert_difference "ActiveStorage::Attachment.count", 3 do
|
316
316
|
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
|
@@ -334,94 +334,94 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
334
334
|
{ identifier: "unpopulated",
|
335
335
|
tag: "file",
|
336
336
|
content: nil
|
337
|
-
}
|
337
|
+
}
|
338
338
|
]
|
339
339
|
},
|
340
|
-
commit:
|
340
|
+
commit: "Create Page"
|
341
341
|
}
|
342
342
|
assert_response :redirect
|
343
343
|
page = Comfy::Cms::Page.last
|
344
344
|
assert_equal @site, page.site
|
345
345
|
assert_redirected_to action: :edit, id: page
|
346
|
-
assert_equal
|
346
|
+
assert_equal "Page created", flash[:success]
|
347
347
|
end
|
348
348
|
end
|
349
349
|
end
|
350
350
|
end
|
351
351
|
|
352
352
|
def test_creation_failure
|
353
|
-
assert_no_difference [
|
354
|
-
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {page: {
|
353
|
+
assert_no_difference ["Comfy::Cms::Page.count", "Comfy::Cms::Fragment.count"] do
|
354
|
+
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: { page: {
|
355
355
|
layout_id: @layout.id,
|
356
356
|
fragments_attributes: [
|
357
|
-
{ identifier:
|
358
|
-
content:
|
359
|
-
{ identifier:
|
360
|
-
content:
|
357
|
+
{ identifier: "content",
|
358
|
+
content: "content content" },
|
359
|
+
{ identifier: "title",
|
360
|
+
content: "title content" }
|
361
361
|
]
|
362
|
-
}}
|
362
|
+
} }
|
363
363
|
assert_response :success
|
364
364
|
page = assigns(:page)
|
365
365
|
|
366
366
|
assert_equal 2, page.fragments.size
|
367
|
-
assert_equal [
|
367
|
+
assert_equal ["content content", "title content"], page.fragments.collect(&:content)
|
368
368
|
assert_template :new
|
369
|
-
assert_equal
|
369
|
+
assert_equal "Failed to create page", flash[:danger]
|
370
370
|
end
|
371
371
|
end
|
372
372
|
|
373
373
|
def test_update
|
374
|
-
assert_no_difference
|
375
|
-
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
|
376
|
-
label:
|
377
|
-
}}
|
374
|
+
assert_no_difference "Comfy::Cms::Fragment.count" do
|
375
|
+
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: { page: {
|
376
|
+
label: "Updated Label"
|
377
|
+
} }
|
378
378
|
@page.reload
|
379
379
|
assert_response :redirect
|
380
380
|
assert_redirected_to action: :edit, id: @page
|
381
|
-
assert_equal
|
382
|
-
assert_equal
|
381
|
+
assert_equal "Page updated", flash[:success]
|
382
|
+
assert_equal "Updated Label", @page.label
|
383
383
|
end
|
384
384
|
end
|
385
385
|
|
386
386
|
def test_update_with_layout_change
|
387
|
-
assert_difference
|
388
|
-
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
|
389
|
-
label:
|
387
|
+
assert_difference "Comfy::Cms::Fragment.count" do
|
388
|
+
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: { page: {
|
389
|
+
label: "Updated Label",
|
390
390
|
layout_id: comfy_cms_layouts(:nested).id,
|
391
391
|
fragments_attributes: [
|
392
|
-
{ identifier:
|
393
|
-
content:
|
394
|
-
{ identifier:
|
395
|
-
content:
|
392
|
+
{ identifier: "content",
|
393
|
+
content: "new_page_text_content" },
|
394
|
+
{ identifier: "header",
|
395
|
+
content: "new_page_string_content" }
|
396
396
|
]
|
397
|
-
}}
|
397
|
+
} }
|
398
398
|
@page.reload
|
399
399
|
assert_response :redirect
|
400
400
|
assert_redirected_to action: :edit, id: @page
|
401
|
-
assert_equal
|
402
|
-
assert_equal
|
403
|
-
identifiers = @page.fragments.collect
|
404
|
-
assert_equal [
|
401
|
+
assert_equal "Page updated", flash[:success]
|
402
|
+
assert_equal "Updated Label", @page.label
|
403
|
+
identifiers = @page.fragments.collect(&:identifier)
|
404
|
+
assert_equal %w[boolean content datetime file header], identifiers.sort
|
405
405
|
end
|
406
406
|
end
|
407
407
|
|
408
408
|
def test_update_failure
|
409
|
-
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
|
409
|
+
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: { page: {
|
410
410
|
label: ""
|
411
|
-
}}
|
411
|
+
} }
|
412
412
|
assert_response :success
|
413
413
|
assert_template :edit
|
414
414
|
assert assigns(:page)
|
415
|
-
assert_equal
|
415
|
+
assert_equal "Failed to update page", flash[:danger]
|
416
416
|
end
|
417
417
|
|
418
418
|
def test_destroy
|
419
|
-
assert_difference
|
420
|
-
assert_difference
|
419
|
+
assert_difference "Comfy::Cms::Page.count", -2 do
|
420
|
+
assert_difference "Comfy::Cms::Fragment.count", -4 do
|
421
421
|
r :delete, comfy_admin_cms_site_page_path(site_id: @site, id: @page)
|
422
422
|
assert_response :redirect
|
423
423
|
assert_redirected_to action: :index
|
424
|
-
assert_equal
|
424
|
+
assert_equal "Page deleted", flash[:success]
|
425
425
|
end
|
426
426
|
end
|
427
427
|
end
|
@@ -455,23 +455,23 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
455
455
|
end
|
456
456
|
|
457
457
|
def test_creation_preview
|
458
|
-
assert_no_difference
|
458
|
+
assert_no_difference "Comfy::Cms::Page.count" do
|
459
459
|
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
|
460
|
-
preview:
|
460
|
+
preview: "Preview",
|
461
461
|
page: {
|
462
|
-
label:
|
463
|
-
slug:
|
462
|
+
label: "Test Page",
|
463
|
+
slug: "test-page",
|
464
464
|
parent_id: @page.id,
|
465
465
|
layout_id: @layout.id,
|
466
466
|
fragments_attributes: [
|
467
|
-
{ identifier:
|
468
|
-
content:
|
467
|
+
{ identifier: "content",
|
468
|
+
content: "preview content" }
|
469
469
|
]
|
470
470
|
}
|
471
471
|
}
|
472
472
|
assert_response :success
|
473
|
-
assert_match
|
474
|
-
assert_equal
|
473
|
+
assert_match %r{preview content}, response.body
|
474
|
+
assert_equal "text/html", response.content_type
|
475
475
|
|
476
476
|
assert_equal @site, assigns(:cms_site)
|
477
477
|
assert_equal @layout, assigns(:cms_layout)
|
@@ -481,21 +481,21 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
481
481
|
end
|
482
482
|
|
483
483
|
def test_update_preview
|
484
|
-
assert_no_difference
|
484
|
+
assert_no_difference "Comfy::Cms::Page.count" do
|
485
485
|
r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {
|
486
|
-
preview:
|
486
|
+
preview: "Preview",
|
487
487
|
page: {
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
488
|
+
label: "Updated Label",
|
489
|
+
fragments_attributes: [
|
490
|
+
{ identifier: "content",
|
491
|
+
content: "preview content" }
|
492
492
|
]
|
493
493
|
}
|
494
494
|
}
|
495
495
|
assert_response :success
|
496
|
-
assert_match
|
496
|
+
assert_match %r{preview content}, response.body
|
497
497
|
@page.reload
|
498
|
-
assert_not_equal
|
498
|
+
assert_not_equal "Updated Label", @page.label
|
499
499
|
|
500
500
|
assert_equal @page.site, assigns(:cms_site)
|
501
501
|
assert_equal @page.layout, assigns(:cms_layout)
|
@@ -504,20 +504,20 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
504
504
|
end
|
505
505
|
|
506
506
|
def test_preview_language
|
507
|
-
@site.update_column(:locale,
|
507
|
+
@site.update_column(:locale, "de")
|
508
508
|
|
509
509
|
assert_equal :en, I18n.locale
|
510
510
|
|
511
511
|
r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
|
512
|
-
preview:
|
512
|
+
preview: "Preview",
|
513
513
|
page: {
|
514
|
-
label:
|
515
|
-
slug:
|
514
|
+
label: "Test Page",
|
515
|
+
slug: "test-page",
|
516
516
|
parent_id: @page.id,
|
517
517
|
layout_id: @layout.id,
|
518
518
|
fragments_attributes: [
|
519
|
-
{ identifier:
|
520
|
-
content:
|
519
|
+
{ identifier: "content",
|
520
|
+
content: "preview content" }
|
521
521
|
]
|
522
522
|
}
|
523
523
|
}
|
@@ -531,7 +531,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
531
531
|
r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
|
532
532
|
assert_response :redirect
|
533
533
|
assert_redirected_to new_comfy_admin_cms_site_layout_path(@site)
|
534
|
-
assert_equal
|
534
|
+
assert_equal "No Layouts found. Please create one.", flash[:danger]
|
535
535
|
end
|
536
536
|
|
537
537
|
def test_get_edit_with_no_layout
|
@@ -539,15 +539,15 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
539
539
|
r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
|
540
540
|
assert_response :redirect
|
541
541
|
assert_redirected_to new_comfy_admin_cms_site_layout_path(@site)
|
542
|
-
assert_equal
|
542
|
+
assert_equal "No Layouts found. Please create one.", flash[:danger]
|
543
543
|
end
|
544
544
|
|
545
545
|
def test_get_toggle_branch
|
546
|
-
r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {format: :js}
|
546
|
+
r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: { format: :js }
|
547
547
|
assert_response :success
|
548
548
|
assert_equal [@page.id.to_s], session[:cms_page_tree]
|
549
549
|
|
550
|
-
r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {format: :js}
|
550
|
+
r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: { format: :js }
|
551
551
|
assert_response :success
|
552
552
|
assert_equal [], session[:cms_page_tree]
|
553
553
|
end
|
@@ -557,8 +557,8 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
557
557
|
page_two = @site.pages.create!(
|
558
558
|
parent: @page,
|
559
559
|
layout: @layout,
|
560
|
-
label:
|
561
|
-
slug:
|
560
|
+
label: "test",
|
561
|
+
slug: "test"
|
562
562
|
)
|
563
563
|
assert_equal 0, page_one.position
|
564
564
|
assert_equal 1, page_two.position
|
@@ -573,4 +573,5 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
|
|
573
573
|
assert_equal 1, page_one.position
|
574
574
|
assert_equal 0, page_two.position
|
575
575
|
end
|
576
|
+
|
576
577
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../../../../../test_helper"
|
2
2
|
|
3
3
|
class Comfy::Admin::Cms::Revisions::LayoutControllerTest < ActionDispatch::IntegrationTest
|
4
4
|
|
@@ -34,7 +34,7 @@ class Comfy::Admin::Cms::Revisions::LayoutControllerTest < ActionDispatch::Integ
|
|
34
34
|
r :get, comfy_admin_cms_site_layout_revision_path(@site, "invalid", @revision)
|
35
35
|
assert_response :redirect
|
36
36
|
assert_redirected_to comfy_admin_cms_site_layouts_path(@site)
|
37
|
-
assert_equal
|
37
|
+
assert_equal "Record Not Found", flash[:danger]
|
38
38
|
end
|
39
39
|
|
40
40
|
def test_get_show_failure
|
@@ -42,21 +42,21 @@ class Comfy::Admin::Cms::Revisions::LayoutControllerTest < ActionDispatch::Integ
|
|
42
42
|
assert_response :redirect
|
43
43
|
assert assigns(:record)
|
44
44
|
assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, assigns(:record))
|
45
|
-
assert_equal
|
45
|
+
assert_equal "Revision Not Found", flash[:danger]
|
46
46
|
end
|
47
47
|
|
48
|
-
|
49
48
|
def test_revert
|
50
|
-
assert_difference -> {@layout.revisions.count} do
|
49
|
+
assert_difference -> { @layout.revisions.count } do
|
51
50
|
r :patch, revert_comfy_admin_cms_site_layout_revision_path(@site, @layout, @revision)
|
52
51
|
assert_response :redirect
|
53
52
|
assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, @layout)
|
54
|
-
assert_equal
|
53
|
+
assert_equal "Content Reverted", flash[:success]
|
55
54
|
|
56
55
|
@layout.reload
|
57
|
-
assert_equal
|
58
|
-
assert_equal
|
59
|
-
assert_equal
|
56
|
+
assert_equal "revision {{cms:fragment content}}", @layout.content
|
57
|
+
assert_equal "revision css", @layout.css
|
58
|
+
assert_equal "revision js", @layout.js
|
60
59
|
end
|
61
60
|
end
|
61
|
+
|
62
62
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../../../../../test_helper"
|
2
2
|
|
3
3
|
class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::IntegrationTest
|
4
4
|
|
@@ -34,24 +34,23 @@ class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::Integra
|
|
34
34
|
r :get, comfy_admin_cms_site_page_revision_path(@site, "invalid", @revision)
|
35
35
|
assert_response :redirect
|
36
36
|
assert_redirected_to comfy_admin_cms_site_pages_path(@site)
|
37
|
-
assert_equal
|
37
|
+
assert_equal "Record Not Found", flash[:danger]
|
38
38
|
end
|
39
39
|
|
40
|
-
|
41
40
|
def test_get_show_failure
|
42
41
|
r :get, comfy_admin_cms_site_page_revision_path(@site, @page, "invalid")
|
43
42
|
assert_response :redirect
|
44
43
|
assert assigns(:record)
|
45
44
|
assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, assigns(:record))
|
46
|
-
assert_equal
|
45
|
+
assert_equal "Revision Not Found", flash[:danger]
|
47
46
|
end
|
48
47
|
|
49
48
|
def test_revert
|
50
|
-
assert_difference -> {@page.revisions.count} do
|
49
|
+
assert_difference -> { @page.revisions.count } do
|
51
50
|
r :patch, revert_comfy_admin_cms_site_page_revision_path(@site, @page, @revision)
|
52
51
|
assert_response :redirect
|
53
52
|
assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
|
54
|
-
assert_equal
|
53
|
+
assert_equal "Content Reverted", flash[:success]
|
55
54
|
|
56
55
|
@page.reload
|
57
56
|
|
@@ -84,4 +83,5 @@ class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::Integra
|
|
84
83
|
], @page.fragments_attributes
|
85
84
|
end
|
86
85
|
end
|
86
|
+
|
87
87
|
end
|