comfortable_mexican_sofa 1.12.11 → 2.0.0

data/lib/generators/comfy/scaffold/templates/{migration.rb → migration.rb.tt}

@@ -1,4 +1,4 @@
-class Create<%= class_name.pluralize %> < ActiveRecord::Migration
+class Create<%= class_name.pluralize %> < ActiveRecord::Migration[5.2]
 
   def change
     create_table :<%= file_name.pluralize %> do |t|
@@ -8,5 +8,4 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-end
+end

data/lib/generators/comfy/scaffold/templates/{model.rb → model.rb.tt}

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

data/lib/generators/comfy/scaffold/templates/tests/{controller.rb → controller.rb.tt}

@@ -1,35 +1,48 @@
 require_relative '../../test_helper'
 
-class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestCase
+class Admin::<%= class_name.pluralize %>ControllerTest < ActionDispatch::IntegrationTest
 
-  def setup
-    # TODO: login as admin user
+  setup do
     @<%= file_name %> = <%= file_name.pluralize %>(: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_<%= file_name.pluralize %>_path
     assert_response :success
     assert assigns(:<%= file_name.pluralize %>)
     assert_template :index
   end
 
   def test_get_show
-    get :show, :id => @<%= file_name %>
+    r :get, admin_<%= file_name %>_path(@<%= file_name %>)
     assert_response :success
     assert assigns(:<%= file_name %>)
     assert_template :show
   end
 
   def test_get_show_failure
-    get :show, :id => 'invalid'
+    r :get, admin_<%= file_name %>_path('invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal '<%= class_name.titleize %> not found', flash[:danger]
   end
 
   def test_get_new
-    get :new
+    r :get, new_admin_<%= file_name %>_path
     assert_response :success
     assert assigns(:<%= file_name %>)
     assert_template :new
@@ -37,7 +50,7 @@ class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestC
   end
 
   def test_get_edit
-    get :edit, :id => @<%= file_name %>
+    r :get, edit_admin_<%= file_name %>_path(@<%= file_name %>)
     assert_response :success
     assert assigns(:<%= file_name %>)
     assert_template :edit
@@ -46,21 +59,21 @@ class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestC
 
   def test_creation
     assert_difference '<%= class_name %>.count' do
-      post :create, :<%= file_name %> => {
+      r :post, admin_<%= file_name.pluralize %>_path, params: {<%= file_name %>: {
       <%- model_attrs.each do |attr| -%>
-        :<%= attr.name %> => 'test <%= attr.name %>',
+        <%= attr.name %>: 'test <%= attr.name %>',
       <%- end -%>
-      }
+      }}
       <%= file_name %> = <%= class_name %>.last
       assert_response :redirect
-      assert_redirected_to :action => :show, :id => <%= file_name %>
+      assert_redirected_to action: :show, id: <%= file_name %>
       assert_equal '<%= class_name.titleize %> created', flash[:success]
     end
   end
 
   def test_creation_failure
     assert_no_difference '<%= class_name %>.count' do
-      post :create, :<%= file_name %> => { }
+      r :post, admin_<%= file_name.pluralize %>_path, params: {<%= file_name %>: { }}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create <%= class_name.titleize %>', flash[:danger]
@@ -68,22 +81,22 @@ class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestC
   end
 
   def test_update
-    put :update, :id => @<%= file_name %>, :<%= file_name %> => {
+    r :put, admin_<%= file_name %>_path(@<%= file_name %>), params: {<%= file_name %>: {
     <%- if attr = model_attrs.first -%>
-      :<%= attr.name %> => 'Updated'
+      <%= attr.name %>: 'Updated'
     <%- end -%>
-    }
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => @<%= file_name %>
+    assert_redirected_to action: :show, id: @<%= file_name %>
     assert_equal '<%= class_name.titleize %> updated', flash[:success]
     @<%= file_name %>.reload
     assert_equal 'Updated', @<%= file_name %>.<%= attr.try(:name) || 'attribute' %>
   end
 
   def test_update_failure
-    put :update, :id => @<%= file_name %>, :<%= file_name %> => {
-      :<%= attr.try(:name) || 'attribute' %> => ''
-    }
+    r :put, admin_<%= file_name %>_path(@<%= file_name %>), params: {<%= file_name %>: {
+      <%= attr.try(:name) || 'attribute' %>: ''
+    }}
     assert_response :success
     assert_template :edit
     assert_equal 'Failed to update <%= class_name.titleize %>', flash[:danger]
@@ -93,10 +106,10 @@ class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestC
 
   def test_destroy
     assert_difference '<%= class_name %>.count', -1 do
-      delete :destroy, :id => @<%= file_name %>
+      r :delete, admin_<%= file_name %>_path(@<%= file_name %>)
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal '<%= class_name.titleize %> deleted', flash[:success]
     end
   end
-end
+end

data/lib/generators/comfy/scaffold/templates/tests/{model.rb → model.rb.tt}

@@ -11,17 +11,16 @@ class <%= class_name %>Test < ActiveSupport::TestCase
   def test_validation
     <%= file_name %> = <%= class_name %>.new
     assert <%= file_name %>.invalid?
-    assert_errors_on <%= file_name %>, <%= model_attrs.collect{|attr| ":#{attr.name}"}.join(', ') %>
+    assert_equal [<%= model_attrs.collect{|attr| ":#{attr.name}"}.join(', ')%>], <%= file_name %>.errors.keys
   end
 
   def test_creation
     assert_difference '<%= class_name %>.count' do
       <%= class_name %>.create(
       <%- model_attrs.each do |attr| -%>
-        :<%= attr.name %> => 'test <%= attr.name %>',
+        <%= attr.name %>: 'test <%= attr.name %>',
       <%- end -%>
       )
     end
   end
-
-end
+end

data/lib/generators/comfy/scaffold/templates/views/_form.haml.tt

@@ -0,0 +1,7 @@
+<%- model_attrs.each do |attr| -%>
+= form.text_field :<%= attr.name %>
+<%- end -%>
+
+= form.form_actions do
+  = form.submit class: "btn btn-primary"
+  = link_to 'Cancel', admin_<%= file_name.pluralize %>_path, class: "btn btn-link"

data/lib/generators/comfy/scaffold/templates/views/{edit.haml → edit.haml.tt}

@@ -2,4 +2,4 @@
   %h2 Edit <%= class_name.titleize %>
 
 = comfy_form_for [:admin, @<%= file_name %>] do |form|
-  = render form
+  = render form

data/lib/generators/comfy/scaffold/templates/views/index.haml.tt

@@ -0,0 +1,21 @@
+.page-header
+  = link_to 'New <%= class_name.titleize %>', new_admin_<%= file_name %>_path, class: 'btn btn-secondary pull-right'
+  %h2= '<%= class_name.pluralize.titleize %>'
+
+= paginate @<%= file_name.pluralize %>, theme: 'comfy'
+
+%ul.list
+  - @<%= file_name.pluralize %>.each do |<%= file_name %>|
+    %li
+      .row
+        .col-md-8.item
+          .item-content
+            .item-title
+              = <%= file_name%>.<%= model_attrs.first.name %>
+
+        .col-md-4.d-flex.align-items-center.justify-content-md-end
+          .btn-group.btn-group-sm
+            = link_to 'Edit', edit_admin_<%= file_name %>_path(<%= file_name %>), class: 'btn btn-outline-secondary'
+            = link_to 'Delete', admin_<%= file_name %>_path(<%= file_name %>), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger'
+
+= paginate @<%= file_name.pluralize %>, theme: 'comfy'

data/lib/generators/comfy/scaffold/templates/views/{new.haml → new.haml.tt}

@@ -2,4 +2,4 @@
   %h2 New <%= class_name.titleize %>
 
 = comfy_form_for [:admin, @<%= file_name %>] do |form|
-  = render form
+  = render form

data/lib/generators/comfy/scaffold/templates/views/{show.haml → show.haml.tt}

@@ -1,4 +1,4 @@
 .page-header
   %h2 <%= class_name.titleize %>
-  
-= debug @<%= file_name %>
+
+= debug @<%= file_name %>

data/lib/tasks/cms_seeds.rake

@@ -0,0 +1,37 @@
+namespace :comfy do
+  namespace :cms_seeds do
+
+    desc 'Import CMS Seed data into database (from: folder name, to: site identifier)'
+
+    task :import, [:from, :to] => [:environment] do |t, args|
+      from  = args[:from]
+      to    = args[:to] || from
+
+      puts "Importing CMS Seed data from Folder [#{from}] to Site [#{to}] ..."
+
+      # changing so that logger is going straight to screen
+      logger = ComfortableMexicanSofa.logger
+      ComfortableMexicanSofa.logger = Logger.new(STDOUT)
+
+      ComfortableMexicanSofa::Seeds::Importer.new(from, to).import!
+
+      ComfortableMexicanSofa.logger = logger
+    end
+
+    desc 'Export database data into CMS Seed files (from: site identifier, to: folder name)'
+    task :export, [:from, :to] => [:environment] do |t, args|
+      from  = args[:from]
+      to    = args[:to] || from
+
+      puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
+
+      # changing so that logger is going straight to screen
+      logger = ComfortableMexicanSofa.logger
+      ComfortableMexicanSofa.logger = Logger.new(STDOUT)
+
+      ComfortableMexicanSofa::Seeds::Exporter.new(from, to).export!
+
+      ComfortableMexicanSofa.logger = logger
+    end
+  end
+end

data/test/controllers/comfy/admin/cms/base_controller_test.rb

@@ -1,18 +1,17 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::BaseControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::BaseControllerTest < ActionDispatch::IntegrationTest
 
   def test_get_jump
-    get :jump
+    r :get, comfy_admin_cms_path
     assert_response :redirect
     assert_redirected_to comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
   end
-  
+
   def test_get_jump_with_redirect_setting
     ComfortableMexicanSofa.config.admin_route_redirect = '/cms-admin/sites'
-    get :jump
+    r :get, comfy_admin_cms_path
     assert_response :redirect
     assert_redirected_to '/cms-admin/sites'
   end
-
-end
+end

data/test/controllers/comfy/admin/cms/categories_controller_test.rb

@@ -1,70 +1,73 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::CategoriesControllerTest < ActionController::TestCase
-  
+class Comfy::Admin::Cms::CategoriesControllerTest < ActionDispatch::IntegrationTest
+
+  def setup
+    @site = comfy_cms_sites(:default)
+  end
+
   def test_get_edit
-    xhr :get, :edit, :site_id => comfy_cms_sites(:default), :id => comfy_cms_categories(:default)
+    r :get, edit_comfy_admin_cms_site_category_path(site_id: @site, id: comfy_cms_categories(:default)), xhr: true
     assert_response :success
     assert_template :edit
     assert assigns(:category)
   end
-  
+
   def test_get_edit_failure
-    xhr :get, :edit, :site_id => comfy_cms_sites(:default), :id => 'invalid'
+    r :get, edit_comfy_admin_cms_site_category_path(site_id: @site, id: 'invalid'), xhr: true
     assert_response :success
     assert response.body.blank?
   end
-  
+
   def test_creation
     assert_difference 'Comfy::Cms::Category.count' do
-      xhr :post, :create, :site_id => comfy_cms_sites(:default), :category => {
-        :label            => 'Test Label',
-        :categorized_type => 'Comfy::Cms::Snippet'
-      }
+      r :post, comfy_admin_cms_site_categories_path(site_id: @site), xhr: true, params: {category: {
+        label:            'Test Label',
+        categorized_type: 'Comfy::Cms::Snippet'
+      }}
       assert_response :success
       assert_template :create
       assert assigns(:category)
     end
   end
-  
+
   def test_creation_failure
     assert_no_difference 'Comfy::Cms::Category.count' do
-      xhr :post, :create, :site_id => comfy_cms_sites(:default), :category => { }
+      r :post, comfy_admin_cms_site_categories_path(site_id: @site), xhr: true, params: {category: {}}
       assert_response :success
       assert response.body.blank?
     end
   end
-  
+
   def test_update
     category = comfy_cms_categories(:default)
-    xhr :put, :update, :site_id => comfy_cms_sites(:default), :id => category, :category => {
-      :label => 'Updated Label'
-    }
+    r :put, comfy_admin_cms_site_category_path(site_id: @site, id: category), xhr: true, params: {category: {
+      label: 'Updated Label'
+    }}
     assert_response :success
     assert_template :update
     assert assigns(:category)
     category.reload
     assert_equal 'Updated Label', category.label
   end
-  
+
   def test_update_failure
     category = comfy_cms_categories(:default)
-    xhr :put, :update, :site_id => comfy_cms_sites(:default), :id => category, :category => {
-      :label => ''
-    }
+    r :put, comfy_admin_cms_site_category_path(site_id: @site, id: category), xhr: true, params: {category: {
+      label: ''
+    }}
     assert_response :success
     assert response.body.blank?
     category.reload
     assert_not_equal '', category.label
   end
-  
+
   def test_destroy
     assert_difference 'Comfy::Cms::Category.count', -1 do
-      xhr :delete, :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_categories(:default)
+      r :delete, comfy_admin_cms_site_category_path(site_id: @site, id: comfy_cms_categories(:default)), xhr: true
       assert assigns(:category)
       assert_response :success
       assert_template :destroy
     end
   end
-  
-end
+end

data/test/controllers/comfy/admin/cms/files_controller_test.rb

@@ -1,6 +1,6 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::FilesControllerTest < ActionDispatch::IntegrationTest
 
   def setup
     @site = comfy_cms_sites(:default)
@@ -8,64 +8,61 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_get_index
-    get :index, :site_id => @site
+    r :get, comfy_admin_cms_site_files_path(site_id: @site)
     assert_response :success
     assert assigns(:files)
     assert_template :index
   end
 
   def test_get_index_with_category
-    get :index, :site_id => @site, :category => comfy_cms_categories(:default).label
+    category = comfy_cms_categories(:default)
+    r :get, comfy_admin_cms_site_files_path(site_id: @site), params: {
+      categories: category.label
+    }
     assert_response :success
     assert assigns(:files)
     assert_equal 1, assigns(:files).count
-    assert assigns(:files).first.categories.member? comfy_cms_categories(:default)
+    assert assigns(:files).first.categories.member? category
   end
 
   def test_get_index_with_category_invalid
-    get :index, :site_id => @site, :category => 'invalid'
+    r :get, comfy_admin_cms_site_files_path(site_id: @site), params: {
+      categories: "invalid"
+    }
     assert_response :success
     assert assigns(:files)
     assert_equal 0, assigns(:files).count
   end
 
-  def test_get_index_with_page_files
-    file = comfy_cms_files(:default)
-    file.update_column(:block_id, comfy_cms_blocks(:default_field_text).id)
-    get :index, :site_id => @site
-    assert_response :success
-    assert_equal 0, assigns(:files).count
-  end
-
   def test_get_index_with_redactor_images
-    file = comfy_cms_files(:default)
-
-    get :index, :site_id => @site, :source => 'redactor', :type => 'image'
+    r :get, comfy_admin_cms_site_files_path(site_id: @site), params: {
+      source: "redactor", type: "image"
+    }
     assert_response :success
 
     assert_equal [{
-      'thumb' => file.file.url(:cms_thumb),
-      'image' => file.file.url,
-      'title' => file.label
+      "thumb" => url_for(@file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+      "image" => url_for(@file.attachment),
+      "title" => @file.label
     }], JSON.parse(response.body)
   end
 
   def test_get_index_with_redactor_files
-    file = comfy_cms_files(:default)
-
-    get :index, :site_id => @site, :source => 'redactor', :type => 'file'
+    r :get, comfy_admin_cms_site_files_path(site_id: @site), params: {
+      source: "redactor", type: "file"
+    }
     assert_response :success
 
     assert_equal [{
-      'title' => file.label,
-      'name'  => file.file_file_name,
-      'link'  => file.file.url,
-      'size'  => '19.6 KB'
+      "title" => @file.label,
+      "name"  => @file.attachment.filename.to_s,
+      "link"  => url_for(@file.attachment),
+      "size"  => "12.1 KB"
     }], JSON.parse(response.body)
   end
 
   def test_get_new
-    get :new, :site_id => @site
+    r :get, new_comfy_admin_cms_site_file_path(site_id: @site)
     assert_response :success
     assert assigns(:file)
     assert_template :new
@@ -73,7 +70,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_get_edit
-    get :edit, :site_id => @site, :id => @file
+    r :get, edit_comfy_admin_cms_site_file_path(site_id: @site, id: @file)
     assert_response :success
     assert assigns(:file)
     assert_template :edit
@@ -81,33 +78,34 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_get_edit_failure
-    get :edit, :site_id => @site, :id => 'not_found'
+    r :get, edit_comfy_admin_cms_site_file_path(site_id: @site, id: 'invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'File not found', flash[:danger]
   end
 
   def test_create
-    assert_difference ['Comfy::Cms::File.count', 'Comfy::Cms::Categorization.count'] do
-      post :create, :site_id => @site, :file => {
-        :label        => 'Test File',
-        :description  => 'Test Description',
-        :file         => fixture_file_upload('files/image.jpg', 'image/jpeg'),
-        :category_ids => {comfy_cms_categories(:default).id => '1'}
-      }
+    models = [Comfy::Cms::File, Comfy::Cms::Categorization, ActiveStorage::Attachment]
+    assert_count_difference models do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params:{file: {
+        label:        'Test File',
+        description:  'Test Description',
+        file:         fixture_file_upload('files/image.jpg', 'image/jpeg'),
+        category_ids: {comfy_cms_categories(:default).id => '1'}
+      }}
       assert_response :redirect
       file = Comfy::Cms::File.last
       assert_equal comfy_cms_sites(:default), file.site
       assert_equal 'Test File', file.label
       assert_equal 'Test Description', file.description
-      assert_redirected_to :action => :edit, :id => file
+      assert_redirected_to action: :edit, id: file
       assert_equal 'Files uploaded', flash[:success]
     end
   end
 
   def test_create_failure
-    assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :site_id => @site, :file => { }
+    assert_count_no_difference Comfy::Cms::File do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {file: {}}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to upload files', flash[:danger]
@@ -115,104 +113,105 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_create_as_plupload
-    assert_difference 'Comfy::Cms::File.count' do
-      post :create,
-        :source   => 'plupload',
-        :site_id  => @site,
-        :file     => {
-          :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
+    assert_count_difference [Comfy::Cms::File, ActiveStorage::Attachment] do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {
+        source: "plupload",
+        file: {
+          file: fixture_file_upload("files/image.jpg", "image/jpeg")
         }
+      }
       assert_response :success
       assert_no_select "body"
-      assert_select "tr[id=comfy_cms_file_#{Comfy::Cms::File.last.id}]"
+      assert_select "li[id=comfy_cms_file_#{Comfy::Cms::File.last.id}]"
     end
   end
 
   def test_create_as_plupload_failure
-    assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :source => 'plupload', :site_id => @site, :file => { }
+    assert_count_no_difference Comfy::Cms::File do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {
+        source: "plupload",
+        file:   {}
+      }
       assert_response :unprocessable_entity
     end
   end
 
   def test_create_as_redactor
-    assert_difference 'Comfy::Cms::File.count' do
-      post :create,
-        :source   => 'redactor',
-        :site_id  => @site,
-        :file     => fixture_file_upload('files/image.jpg', 'image/jpeg')
+    assert_count_difference [Comfy::Cms::File, ActiveStorage::Attachment, Comfy::Cms::Categorization] do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {
+        source: "redactor",
+        file:   fixture_file_upload("files/image.jpg", "image/jpeg")
+      }
       assert_response :success
 
       file = Comfy::Cms::File.last
       assert_equal ({
-        'filelink' => file.file.url,
-        'filename' => file.label
+        "filelink" => url_for(file.attachment),
+        "filename" => file.attachment.filename
       }), JSON.parse(response.body)
+
+      category = Comfy::Cms::Category.last
+      assert_equal "wysiwyg", category.label
+      assert_equal [category], file.categories
     end
   end
 
   def test_create_as_redactor_failure
-    assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :source => 'redactor', :site_id => @site, :file => { }
+    assert_count_no_difference Comfy::Cms::File do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {
+        source: "redactor",
+        file:   {}
+      }
       assert_response :unprocessable_entity
     end
   end
-  
+
   def test_create_as_plupload_with_selected_category
     category = comfy_cms_categories(:default)
-    
-    assert_difference 'Comfy::Cms::File.count' do
-      post :create,
-        :source   => 'plupload',
-        :site_id  => @site,
-        :file     => {
-          :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
+
+    assert_count_difference [Comfy::Cms::File, ActiveStorage::Attachment] do
+      r :post, comfy_admin_cms_site_files_path(site_id: @site), params: {
+        category: [category.label],
+        source:   "plupload",
+        file: {
+          file: fixture_file_upload("files/image.jpg", "image/jpeg")
         },
-        :category => [category.label]
+
+      }
       assert_response :success
-      
+
       file = Comfy::Cms::File.last
       assert_equal [category], file.categories
     end
   end
 
   def test_update
-    put :update, :site_id => @site, :id => @file, :file => {
-      :label        => 'New File',
-      :description  => 'New Description',
-      :file         => fixture_file_upload('files/image.jpg', 'image/jpeg')
-    }
+    r :put, comfy_admin_cms_site_file_path(site_id: @site, id: @file), params: { file: {
+      label:       "Updated File",
+      description: "Updated Description",
+      file:        fixture_file_upload("files/image.jpg", "image/jpeg")
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :edit, :site_id => @site, :id => @file
-    assert_equal 'File updated', flash[:success]
+    assert_redirected_to action: :edit, site_id: @site, id: @file
+    assert_equal "File updated", flash[:success]
     @file.reload
-    assert_equal 'New File', @file.label
-    assert_equal 'New Description', @file.description
-  end
-
-  def test_update_failure
-    put :update, :site_id => @site, :id => @file, :file => {
-      :file_file_name => ""
-    }
-    assert_response :success
-    assert_template :edit
-    @file.reload
-    assert_not_equal nil, @file.file
-    assert_equal 'Failed to update file', flash[:danger]
+    assert_equal "Updated File", @file.label
+    assert_equal "Updated Description", @file.description
+    assert_equal "image.jpg", @file.attachment.filename.to_s
   end
 
   def test_destroy
-    assert_difference 'Comfy::Cms::File.count', -1 do
-      delete :destroy, :site_id => @site, :id => @file
+    assert_count_difference [Comfy::Cms::File, ActiveStorage::Attachment], -1 do
+      r :delete, comfy_admin_cms_site_file_path(site_id: @site, id: @file)
       assert_response :redirect
-      assert_redirected_to :action => :index
-      assert_equal 'File deleted', flash[:success]
+      assert_redirected_to action: :index
+      assert_equal "File deleted", flash[:success]
     end
   end
 
   def test_destroy_as_xhr
-    assert_difference 'Comfy::Cms::File.count', -1 do
-      xhr :delete, :destroy, :site_id => @site, :id => @file
+    assert_count_difference [Comfy::Cms::File], -1 do
+      r :delete, comfy_admin_cms_site_file_path(site_id: @site, id: @file), xhr: true
       assert_response :success
     end
   end
@@ -220,12 +219,14 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   def test_reorder
     file_one = @file
     file_two = @site.files.create(
-      :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
+      file: fixture_file_upload('files/image.jpg', 'image/jpeg')
     )
     assert_equal 0, file_one.position
     assert_equal 1, file_two.position
 
-    put :reorder, :site_id => @site, :comfy_cms_file => [file_two.id, file_one.id]
+    r :put, reorder_comfy_admin_cms_site_files_path(site_id: @site), params: {
+      :comfy_cms_file => [file_two.id, file_one.id]
+    }
     assert_response :success
     file_one.reload
     file_two.reload
@@ -233,5 +234,4 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_equal 1, file_one.position
     assert_equal 0, file_two.position
   end
-
 end