comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/fixtures/active_storage/attachments.yml

@@ -0,0 +1,9 @@
+default:
+  record: default (Comfy::Cms::File)
+  name: attachment
+  blob: default
+
+file:
+  record: file (Comfy::Cms::Fragment)
+  name: attachments
+  blob: fragment

data/test/fixtures/active_storage/blobs.yml

@@ -0,0 +1,13 @@
+default:
+  key: 123abc
+  filename: default.jpg
+  content_type: image/jpg
+  byte_size: 12345
+  checksum: 123abc
+
+fragment:
+  key: 456def
+  filename: fragment.jpg
+  content_type: image/jpg
+  byte_size: 12345
+  checksum: 456def

data/test/fixtures/comfy/cms/files.yml

@@ -1,9 +1,5 @@
 default:
   site: default
-  block:
-  label: Default File
-  file_file_name: sample.jpg
-  file_content_type: image/jpeg
-  file_file_size: 20099
-  description: Default Description
+  label: default file
+  description: default description
   position: 0

data/test/fixtures/comfy/cms/fragments.yml

@@ -0,0 +1,25 @@
+default:
+  record: default (Comfy::Cms::Page)
+  identifier: content
+  tag: text
+  content: content
+
+file:
+  record: default (Comfy::Cms::Page)
+  identifier: file
+  tag: file
+  content:
+
+datetime:
+  record: default (Comfy::Cms::Page)
+  identifier: datetime
+  tag: datetime
+  content:
+  datetime: <%= DateTime.parse("1981-10-04 12:34:56") %>
+
+boolean:
+  record: default (Comfy::Cms::Page)
+  identifier: boolean
+  tag: checkbox
+  content:
+  boolean: true

data/test/fixtures/comfy/cms/layouts.yml

@@ -4,37 +4,31 @@ default:
   identifier: default
   parent:
   content: |-
-    {{cms:field:default_field_text:text}}
-    layout_content_a
-    {{cms:page:default_page_text:text}}
-    layout_content_b
-    {{cms:snippet:default}}
-    layout_content_c
+    {{cms:text content}}
   css: default_css
   js: default_js
   position: 0
-    
+
 nested:
   site: default
   label: Nested Layout
   identifier: nested
   parent:
   content: |-
-    {{cms:page:header}}
-    {{cms:page:content}}
+    {{cms:text header}}
+    {{cms:text content}}
   css: nested_css
   js: nested_js
   position: 0
-    
+
 child:
   site: default
   label: Child Layout
   identifier: child
   parent: nested
   content: |-
-    {{cms:page:left_column}}
-    {{cms:page:right_column}}
+    {{cms:text left_column}}
+    {{cms:text right_column}}
   css: child_css
   js: child_js
   position: 0
-

data/test/fixtures/comfy/cms/pages.yml

@@ -9,16 +9,8 @@ default:
   children_count: 1
   position: 0
   is_published: true
-  content_cache: |-
-    
-    layout_content_a
-    default_page_text_content_a
-    default_snippet_content
-    default_page_text_content_b
-    layout_content_b
-    default_snippet_content
-    layout_content_c
-  
+  content_cache:
+
 child:
   site: default
   parent: default
@@ -30,10 +22,3 @@ child:
   children_count: 0
   position: 0
   is_published: true
-  content_cache: |-
-    
-    layout_content_a
-    
-    layout_content_b
-    default_snippet_content
-    layout_content_c

data/test/fixtures/comfy/cms/revisions.yml

@@ -1,20 +1,28 @@
 layout:
   record: default (Comfy::Cms::Layout)
   data: <%= {
-    'content' => 'revision {{cms:page:default_page_text}}',
+    'content' => 'revision {{cms:fragment content}}',
     'css'     => 'revision css',
     'js'      => 'revision js' }.to_yaml.inspect %>
-    
+
 page:
   record: default (Comfy::Cms::Page)
   data: <%= {
-    'blocks_attributes' => [
-      { 'identifier'  => 'default_page_text',
-        'content'     => 'revision page content' },
-      { 'identifier'  => 'default_field_text',
-        'content'     => 'revision field content'}
+    'fragments_attributes' => [
+      { 'identifier'  => 'content',
+        'content'     => 'old content' },
+      { 'identifier'  => 'title',
+        'content'     => 'old title'}
     ]}.to_yaml.inspect %>
-      
+
+translation:
+  record: default (Comfy::Cms::Translation)
+  data: <%= {
+    "fragments_attributes" => [
+      { "identifier" => "content",
+        "content"    => "old content" }
+    ]}.to_yaml.inspect %>
+
 snippet:
   record: default (Comfy::Cms::Snippet)
   data: <%= {

data/test/fixtures/comfy/cms/sites.yml

@@ -3,4 +3,3 @@ default:
   identifier: default-site
   hostname: test.host
   path:
-  is_mirrored: false

data/test/fixtures/comfy/cms/snippets.yml

@@ -2,5 +2,5 @@ default:
   site: default
   label: Default Snippet
   identifier: default
-  content: default_snippet_content
+  content: snippet content
   position: 0

data/test/fixtures/comfy/cms/translations.yml

@@ -0,0 +1,7 @@
+default:
+  page: default
+  layout: default
+  locale: fr
+  label: Default Translation
+  is_published: true
+  content_cache: Translation Content

data/test/fixtures/generators/cms/application.rb

@@ -0,0 +1,7 @@
+module TestApp
+  class Application < Rails::Application
+    # Ensuring that ActiveStorage routes are loaded before Comfy's globbing
+    # route. Without this file serving routes are inaccessible.
+    config.railties_order = [ActiveStorage::Engine, :main_app, :all]
+  end
+end

data/test/fixtures/generators/cms/routes.rb

@@ -1,8 +1,5 @@
 Test::Application.routes.draw do
-
-  comfy_route :cms_admin, :path => '/admin'
-
-  # Make sure this routeset is defined last
-  comfy_route :cms, :path => '/', :sitemap => false
-
-end
+  comfy_route :cms_admin, path: "/admin"
+  # Ensure that this route is defined last
+  comfy_route :cms, path: "/"
+end

data/test/fixtures/generators/scaffold/controller.rb

@@ -1,7 +1,7 @@
-class Admin::FoosController < Comfy::Admin::Cms::BaseController
+class Admin::FoosController < Comfy::Admin::BaseController
 
-  before_action :build_foo,  :only => [:new, :create]
-  before_action :load_foo,   :only => [:show, :edit, :update, :destroy]
+  before_action :build_foo,  only: [:new, :create]
+  before_action :load_foo,   only: [:show, :edit, :update, :destroy]
 
   def index
     @foos = Foo.page(params[:page])
@@ -22,25 +22,25 @@ class Admin::FoosController < Comfy::Admin::Cms::BaseController
   def create
     @foo.save!
     flash[:success] = 'Foo created'
-    redirect_to :action => :show, :id => @foo
+    redirect_to action: :show, id: @foo
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = 'Failed to create Foo'
-    render :action => :new
+    render action: :new
   end
 
   def update
     @foo.update_attributes!(foo_params)
     flash[:success] = 'Foo updated'
-    redirect_to :action => :show, :id => @foo
+    redirect_to action: :show, id: @foo
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = 'Failed to update Foo'
-    render :action => :edit
+    render action: :edit
   end
 
   def destroy
     @foo.destroy
     flash[:success] = 'Foo deleted'
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
 protected
@@ -53,10 +53,10 @@ protected
     @foo = Foo.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = 'Foo not found'
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def foo_params
     params.fetch(:foo, {}).permit(:bar)
   end
-end
+end

data/test/fixtures/generators/scaffold/migration.rb

@@ -1,4 +1,4 @@
-class CreateFoos < ActiveRecord::Migration
+class CreateFoos < ActiveRecord::Migration[5.2]
 
   def change
     create_table :foos do |t|
@@ -6,5 +6,4 @@ class CreateFoos < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-end
+end

data/test/fixtures/generators/scaffold/model.rb

@@ -1,21 +1,21 @@
 class Foo < ActiveRecord::Base
 
-  # -- Relationships --------------------------------------------------------
+  # -- Relationships -----------------------------------------------------------
 
 
-  # -- Callbacks ------------------------------------------------------------
+  # -- Callbacks ---------------------------------------------------------------
 
 
-  # -- Validations ----------------------------------------------------------
+  # -- Validations -------------------------------------------------------------
 
 
-  # -- Scopes ---------------------------------------------------------------
+  # -- Scopes ------------------------------------------------------------------
 
 
-  # -- Class Methods --------------------------------------------------------
+  # -- Class Methods -----------------------------------------------------------
 
 
-  # -- Instance Methods -----------------------------------------------------
+  # -- Instance Methods --------------------------------------------------------
 
 
-end
+end

data/test/fixtures/generators/scaffold/routes.rb

@@ -1,7 +1,6 @@
 Test::Application.routes.draw do
-
   namespace :admin do
     resources :foos
   end
 
-end
+end

data/test/fixtures/generators/scaffold/tests/controller.rb

@@ -1,35 +1,48 @@
 require_relative '../../test_helper'
 
-class Admin::FoosControllerTest < ActionController::TestCase
+class Admin::FoosControllerTest < ActionDispatch::IntegrationTest
 
-  def setup
-    # TODO: login as admin user
+  setup do
     @foo = foos(:default)
   end
 
+  # Vanilla CMS has BasicAuth, so we need to send that with each request.
+  # Change this to fit your app's authentication strategy.
+  # Move this to test_helper.rb
+  def r(verb, path, options = {})
+    headers = options[:headers] || {}
+    headers['HTTP_AUTHORIZATION'] =
+      ActionController::HttpAuthentication::Basic.encode_credentials(
+        ComfortableMexicanSofa::AccessControl::AdminAuthentication.username,
+        ComfortableMexicanSofa::AccessControl::AdminAuthentication.password
+      )
+    options.merge!(headers: headers)
+    send(verb, path, options)
+  end
+
   def test_get_index
-    get :index
+    r :get, admin_foos_path
     assert_response :success
     assert assigns(:foos)
     assert_template :index
   end
 
   def test_get_show
-    get :show, :id => @foo
+    r :get, admin_foo_path(@foo)
     assert_response :success
     assert assigns(:foo)
     assert_template :show
   end
 
   def test_get_show_failure
-    get :show, :id => 'invalid'
+    r :get, admin_foo_path('invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'Foo not found', flash[:danger]
   end
 
   def test_get_new
-    get :new
+    r :get, new_admin_foo_path
     assert_response :success
     assert assigns(:foo)
     assert_template :new
@@ -37,7 +50,7 @@ class Admin::FoosControllerTest < ActionController::TestCase
   end
 
   def test_get_edit
-    get :edit, :id => @foo
+    r :get, edit_admin_foo_path(@foo)
     assert_response :success
     assert assigns(:foo)
     assert_template :edit
@@ -46,19 +59,19 @@ class Admin::FoosControllerTest < ActionController::TestCase
 
   def test_creation
     assert_difference 'Foo.count' do
-      post :create, :foo => {
-        :bar => 'test bar',
-      }
+      r :post, admin_foos_path, params: {foo: {
+        bar: 'test bar',
+      }}
       foo = Foo.last
       assert_response :redirect
-      assert_redirected_to :action => :show, :id => foo
+      assert_redirected_to action: :show, id: foo
       assert_equal 'Foo created', flash[:success]
     end
   end
 
   def test_creation_failure
     assert_no_difference 'Foo.count' do
-      post :create, :foo => { }
+      r :post, admin_foos_path, params: {foo: { }}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create Foo', flash[:danger]
@@ -66,20 +79,20 @@ class Admin::FoosControllerTest < ActionController::TestCase
   end
 
   def test_update
-    put :update, :id => @foo, :foo => {
-      :bar => 'Updated'
-    }
+    r :put, admin_foo_path(@foo), params: {foo: {
+      bar: 'Updated'
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => @foo
+    assert_redirected_to action: :show, id: @foo
     assert_equal 'Foo updated', flash[:success]
     @foo.reload
     assert_equal 'Updated', @foo.bar
   end
 
   def test_update_failure
-    put :update, :id => @foo, :foo => {
-      :bar => ''
-    }
+    r :put, admin_foo_path(@foo), params: {foo: {
+      bar: ''
+    }}
     assert_response :success
     assert_template :edit
     assert_equal 'Failed to update Foo', flash[:danger]
@@ -89,10 +102,10 @@ class Admin::FoosControllerTest < ActionController::TestCase
 
   def test_destroy
     assert_difference 'Foo.count', -1 do
-      delete :destroy, :id => @foo
+      r :delete, admin_foo_path(@foo)
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal 'Foo deleted', flash[:success]
     end
   end
-end
+end