comfortable_mexican_sofa 1.12.11 → 2.0.0

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

@@ -1,138 +1,248 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::RevisionsControllerTest < ActionController::TestCase
-  
+class Comfy::Admin::Cms::RevisionsControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site         = comfy_cms_sites(:default)
+    @layout       = comfy_cms_layouts(:default)
+    @page         = comfy_cms_pages(:default)
+    @translation  = comfy_cms_translations(:default)
+    @snippet      = comfy_cms_snippets(:default)
+  end
+
   def test_get_index_for_layouts
-    get :index, :site_id => comfy_cms_sites(:default), :layout_id => comfy_cms_layouts(:default)
+    r :get, comfy_admin_cms_site_layout_revisions_path(@site, @layout)
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => comfy_cms_revisions(:layout)
+    assert_redirected_to action: :show, id: comfy_cms_revisions(:layout)
   end
-  
+
   def test_get_index_for_pages
-    get :index, :site_id => comfy_cms_sites(:default), :page_id => comfy_cms_pages(:default)
+    r :get, comfy_admin_cms_site_page_revisions_path(@site, @page)
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => comfy_cms_revisions(:page)
+    assert_redirected_to action: :show, id: comfy_cms_revisions(:page)
   end
-  
+
   def test_get_index_for_snippets
-    get :index, :site_id => comfy_cms_sites(:default), :snippet_id => comfy_cms_snippets(:default)
+    r :get, comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => comfy_cms_revisions(:snippet)
+    assert_redirected_to action: :show, id: comfy_cms_revisions(:snippet)
   end
-  
+
+  def test_get_index_for_translations
+    r :get, comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation)
+    assert_response :redirect
+    assert_redirected_to action: :show, id: comfy_cms_revisions(:translation)
+  end
+
   def test_get_index_for_snippets_with_no_revisions
     Comfy::Cms::Revision.delete_all
-    get :index, :site_id => comfy_cms_sites(:default), :snippet_id => comfy_cms_snippets(:default)
+    r :get, comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
     assert_response :redirect
-    assert_redirected_to :action => :show, :id => 0
+    assert_redirected_to action: :show, id: 0
   end
-  
+
   def test_get_show_for_layout
-    get :show, :site_id => comfy_cms_sites(:default), :layout_id => comfy_cms_layouts(:default), :id => comfy_cms_revisions(:layout)
+    r :get, comfy_admin_cms_site_layout_revision_path(
+      site_id:    @site,
+      layout_id:  @layout,
+      id:         comfy_cms_revisions(:layout))
     assert_response :success
     assert assigns(:record)
     assert assigns(:revision)
     assert assigns(:record).is_a?(Comfy::Cms::Layout)
     assert_template :show
   end
-  
+
   def test_get_show_for_page
-    get :show, :site_id => comfy_cms_sites(:default), :page_id => comfy_cms_pages(:default), :id => comfy_cms_revisions(:page)
+    r :get, comfy_admin_cms_site_page_revision_path(
+      site_id:  @site,
+      page_id:  @page,
+      id:       comfy_cms_revisions(:page))
     assert_response :success
     assert assigns(:record)
     assert assigns(:revision)
     assert assigns(:record).is_a?(Comfy::Cms::Page)
     assert_template :show
   end
-  
+
+  def test_get_show_for_translation
+    r :get, comfy_admin_cms_site_page_translation_revision_path(
+      site_id:        @site,
+      page_id:        @page,
+      translation_id: @translation,
+      id:             comfy_cms_revisions(:translation))
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Cms::Translation)
+    assert_template :show
+  end
+
   def test_get_show_for_snippet
-    get :show, :site_id => comfy_cms_sites(:default), :snippet_id => comfy_cms_snippets(:default), :id => comfy_cms_revisions(:snippet)
+    r :get, comfy_admin_cms_site_snippet_revision_path(
+      site_id:    @site,
+      snippet_id: @snippet,
+      id:         comfy_cms_revisions(:snippet))
     assert_response :success
     assert assigns(:record)
     assert assigns(:revision)
     assert assigns(:record).is_a?(Comfy::Cms::Snippet)
     assert_template :show
   end
-  
+
   def test_get_show_for_bad_type
-    get :show, :site_id => comfy_cms_sites(:default), :snippet_id => 'invalid', :id => comfy_cms_revisions(:snippet)
+    r :get, comfy_admin_cms_site_layout_revision_path(
+      site_id:    @site,
+      layout_id:  'invalid',
+      id:         comfy_cms_revisions(:layout))
     assert_response :redirect
     assert_redirected_to comfy_admin_cms_path
     assert_equal 'Record Not Found', flash[:danger]
   end
-  
+
   def test_get_show_for_layout_failure
-    site = comfy_cms_sites(:default)
-    get :show, :site_id => site, :layout_id => comfy_cms_layouts(:default), :id => 'invalid'
+    r :get, comfy_admin_cms_site_layout_revision_path(
+      site_id:    @site,
+      layout_id:  @layout,
+      id:         'invalid')
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_comfy_admin_cms_site_layout_path(site, assigns(:record))
+    assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:danger]
   end
-  
+
   def test_get_show_for_page_failure
-    site = comfy_cms_sites(:default)
-    get :show, :site_id => site, :page_id => comfy_cms_pages(:default), :id => 'invalid'
+    r :get, comfy_admin_cms_site_page_revision_path(
+      site_id: @site,
+      page_id: @page,
+      id:     'invalid')
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_comfy_admin_cms_site_page_path(site, assigns(:record))
+    assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:danger]
   end
-  
+
+  def test_get_show_for_translation_failure
+    r :get, comfy_admin_cms_site_page_translation_revision_path(
+      site_id:        @site,
+      page_id:        @page,
+      translation_id: @translation,
+      id:             'invalid')
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
   def test_get_show_for_snippet_failure
-    site = comfy_cms_sites(:default)
-    get :show, :site_id => site, :snippet_id => comfy_cms_snippets(:default), :id => 'invalid'
+    r :get, comfy_admin_cms_site_snippet_revision_path(
+      site_id:    @site,
+      snippet_id: @snippet,
+      id:         'invalid')
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_comfy_admin_cms_site_snippet_path(site, assigns(:record))
+    assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:danger]
   end
-  
+
   def test_revert_for_layout
-    layout = comfy_cms_layouts(:default)
-    
-    assert_difference 'layout.revisions.count' do 
-      put :revert, :site_id => comfy_cms_sites(:default), :layout_id => layout, :id => comfy_cms_revisions(:layout)
+    assert_difference -> {@layout.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_layout_revision_path(
+        site_id:    @site,
+        layout_id:  @layout,
+        id:         comfy_cms_revisions(:layout)
+      )
       assert_response :redirect
-      assert_redirected_to edit_comfy_admin_cms_site_layout_path(layout.site, layout)
+      assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, @layout)
       assert_equal 'Content Reverted', flash[:success]
-      
-      layout.reload
-      assert_equal 'revision {{cms:page:default_page_text}}', layout.content
-      assert_equal 'revision css', layout.css
-      assert_equal 'revision js', layout.js
+
+      @layout.reload
+      assert_equal 'revision {{cms:fragment content}}', @layout.content
+      assert_equal 'revision css', @layout.css
+      assert_equal 'revision js', @layout.js
     end
   end
-  
+
   def test_revert_for_page
-    page = comfy_cms_pages(:default)
-    
-    assert_difference 'page.revisions.count' do
-      put :revert, :site_id => comfy_cms_sites(:default), :page_id => page, :id => comfy_cms_revisions(:page)
+    assert_difference -> {@page.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_page_revision_path(
+        site_id:  @site,
+        page_id:  @page,
+        id:       comfy_cms_revisions(:page)
+      )
       assert_response :redirect
-      assert_redirected_to edit_comfy_admin_cms_site_page_path(page.site, page)
+      assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
       assert_equal 'Content Reverted', flash[:success]
-      
-      page.reload
+
+      @page.reload
+
       assert_equal [
-        { :identifier => 'default_field_text', :content => 'revision field content'  },
-        { :identifier => 'default_page_text',  :content => 'revision page content'   }
-      ], page.blocks_attributes
+        { identifier: "boolean",
+          tag:        "checkbox",
+          content:    nil,
+          datetime:   nil,
+          boolean:    true },
+        { identifier: "file",
+          tag:        "file",
+          content:    nil,
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "datetime",
+          tag:        "datetime",
+          content:    nil,
+          datetime:   comfy_cms_fragments(:datetime).datetime,
+          boolean:    false },
+        { identifier: "content",
+          tag:        "text",
+          content:    "old content",
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "title",
+          tag:        "text",
+          content:    "old title",
+          datetime:   nil,
+          boolean:    false }
+      ], @page.fragments_attributes
     end
   end
-  
+
+  def test_revert_for_page
+    assert_difference -> {@translation.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_page_translation_revision_path(
+        site_id:        @site,
+        page_id:        @page,
+        translation_id: @translation,
+        id:             comfy_cms_revisions(:translation)
+      )
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @translation.reload
+
+      assert_equal [
+        { identifier: "content",
+          tag:        "text",
+          content:    "old content",
+          datetime:   nil,
+          boolean:    false }
+      ], @translation.fragments_attributes
+    end
+  end
+
   def test_revert_for_snippet
-    snippet = comfy_cms_snippets(:default)
-    
-    assert_difference 'snippet.revisions.count' do
-      put :revert, :site_id => comfy_cms_sites(:default), :snippet_id => snippet, :id => comfy_cms_revisions(:snippet)
+    assert_difference -> {@snippet.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_snippet_revision_path(
+        site_id:    @site,
+        snippet_id: @snippet,
+        id:         comfy_cms_revisions(:snippet)
+      )
       assert_response :redirect
-      assert_redirected_to edit_comfy_admin_cms_site_snippet_path(snippet.site, snippet)
+      assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, @snippet)
       assert_equal 'Content Reverted', flash[:success]
-      
-      snippet.reload
-      assert_equal 'revision content', snippet.content
+
+      @snippet.reload
+      assert_equal 'revision content', @snippet.content
     end
   end
-  
 end

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

@@ -1,9 +1,9 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::SitesControllerTest < ActionDispatch::IntegrationTest
 
   def test_get_index
-    get :index
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert assigns(:sites)
     assert_template :index
@@ -11,13 +11,13 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
 
   def test_get_index_with_no_sites
     Comfy::Cms::Site.delete_all
-    get :index
+    r :get, comfy_admin_cms_sites_path
     assert_response :redirect
-    assert_redirected_to :action => :new
+    assert_redirected_to new_comfy_admin_cms_site_path
   end
 
   def test_get_new
-    get :new
+    r :get, new_comfy_admin_cms_site_path
     assert_response :success
     assert assigns(:site)
     assert_equal 'test.host', assigns(:site).hostname
@@ -27,7 +27,7 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
 
   def test_get_edit
     site = comfy_cms_sites(:default)
-    get :edit, :id => site
+    r :get, edit_comfy_admin_cms_site_path(id: site)
     assert_response :success
     assert assigns(:site)
     assert_template :edit
@@ -35,29 +35,29 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
   end
 
   def test_get_edit_failure
-    get :edit, :id => 'not_found'
+    r :get, edit_comfy_admin_cms_site_path(id: 'invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'Site not found', flash[:danger]
   end
 
   def test_create
     assert_difference 'Comfy::Cms::Site.count' do
-      post :create, :site => {
-        :label      => 'Test Site',
-        :identifier => 'test-site',
-        :hostname   => 'test.site.local'
-      }
+      r :post, comfy_admin_cms_sites_path, params: {site: {
+        label:      'Test Site',
+        identifier: 'test-site',
+        hostname:   'test.site.local'
+      }}
       assert_response :redirect
       site = Comfy::Cms::Site.last
-      assert_redirected_to comfy_admin_cms_site_layouts_path(site)
+      assert_redirected_to comfy_admin_cms_site_layouts_path(site_id: site)
       assert_equal 'Site created', flash[:success]
     end
   end
 
   def test_creation_failure
     assert_no_difference 'Comfy::Cms::Site.count' do
-      post :create, :site => { }
+      r :post, comfy_admin_cms_sites_path, params: {site: {}}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create site', flash[:danger]
@@ -66,27 +66,25 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
 
   def test_update
     site = comfy_cms_sites(:default)
-    put :update, :id => site, :site => {
-      :label        => 'New Site',
-      :hostname     => 'new.site.local',
-      :locale       => 'es',
-      :is_mirrored  => '1'
-    }
+    r :put, comfy_admin_cms_site_path(id: site), params: {site: {
+      label:    'New Site',
+      hostname: 'new.site.local',
+      locale:   'es'
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :edit, :id => site
+    assert_redirected_to action: :edit, id: site
     assert_equal 'Site updated', flash[:success]
     site.reload
     assert_equal 'New Site', site.label
     assert_equal 'new.site.local', site.hostname
     assert_equal 'es', site.locale
-    assert site.is_mirrored?
   end
 
   def test_update_failure
     site = comfy_cms_sites(:default)
-    put :update, :id => site, :site => {
-      :hostname => ''
-    }
+    r :put, comfy_admin_cms_site_path(id: site), params: {site: {
+      hostname: ''
+    }}
     assert_response :success
     assert_template :edit
     site.reload
@@ -96,10 +94,10 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionController::TestCase
 
   def test_destroy
     assert_difference 'Comfy::Cms::Site.count', -1 do
-      delete :destroy, :id => comfy_cms_sites(:default)
+      r :delete, comfy_admin_cms_site_path(id: comfy_cms_sites(:default))
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal 'Site deleted', flash[:success]
     end
   end
-end
+end

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

@@ -1,9 +1,14 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::SnippetsControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @snippet  = comfy_cms_snippets(:default)
+  end
 
   def test_get_index
-    get :index, :site_id => comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site)
     assert_response :success
     assert assigns(:snippets)
     assert_template :index
@@ -11,19 +16,19 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
 
   def test_get_index_with_no_snippets
     Comfy::Cms::Snippet.delete_all
-    get :index, :site_id => comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site)
     assert_response :redirect
-    assert_redirected_to :action => :new
+    assert_redirected_to action: :new
   end
 
   def test_get_index_with_category
-    category = comfy_cms_sites(:default).categories.create!(
-      :label            => 'Test Category', 
-      :categorized_type => 'Comfy::Cms::Snippet'
+    category = @site.categories.create!(
+      label:            'Test Category',
+      categorized_type: 'Comfy::Cms::Snippet'
     )
-    category.categorizations.create!(:categorized => comfy_cms_snippets(:default))
+    category.categorizations.create!(categorized: @snippet)
 
-    get :index, :site_id => comfy_cms_sites(:default), :category => category.label
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: {categories: category.label}
     assert_response :success
     assert assigns(:snippets)
     assert_equal 1, assigns(:snippets).count
@@ -31,63 +36,62 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
   end
 
   def test_get_index_with_category_invalid
-    get :index, :site_id => comfy_cms_sites(:default), :category => 'invalid'
+    r :get, comfy_admin_cms_site_snippets_path(site_id: @site), params: {categories: 'invalid'}
     assert_response :success
     assert assigns(:snippets)
     assert_equal 0, assigns(:snippets).count
   end
 
   def test_get_new
-    site = comfy_cms_sites(:default)
-    get :new, :site_id => site
+    r :get, new_comfy_admin_cms_site_snippet_path(site_id: @site)
     assert_response :success
     assert assigns(:snippet)
     assert_template :new
-    assert_select "form[action='/admin/sites/#{site.id}/snippets']"
+    assert_select "form[action='/admin/sites/#{@site.id}/snippets']"
   end
 
   def test_get_edit
-    snippet = comfy_cms_snippets(:default)
-    get :edit, :site_id => snippet.site, :id => snippet
+    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet)
     assert_response :success
     assert assigns(:snippet)
     assert_template :edit
-    assert_select "form[action='/admin/sites/#{snippet.site.id}/snippets/#{snippet.id}']"
+    assert_select "form[action='/admin/sites/#{@site.id}/snippets/#{@snippet.id}']"
   end
 
   def test_get_edit_with_params
-    snippet = comfy_cms_snippets(:default)
-    get :edit, :site_id => snippet.site, :id => snippet, :snippet => {:label => 'New Label'}
+    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
+      label: 'New Label'
+    }}
     assert_response :success
     assert assigns(:snippet)
     assert_equal 'New Label', assigns(:snippet).label
   end
 
   def test_get_edit_failure
-    get :edit, :site_id => comfy_cms_sites(:default), :id => 'not_found'
+    r :get, edit_comfy_admin_cms_site_snippet_path(site_id: @site, id: 'invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'Snippet not found', flash[:danger]
   end
 
   def test_create
     assert_difference 'Comfy::Cms::Snippet.count' do
-      post :create, :site_id => comfy_cms_sites(:default), :snippet => {
-        :label      => 'Test Snippet',
-        :identifier => 'test-snippet',
-        :content    => 'Test Content'
-      }
+      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: {snippet: {
+        label:      'Test Snippet',
+        identifier: 'test-snippet',
+        content:    'Test Content'
+      }}
       assert_response :redirect
       snippet = Comfy::Cms::Snippet.last
-      assert_equal comfy_cms_sites(:default), snippet.site
-      assert_redirected_to :action => :edit, :id => snippet
+      assert_equal @site, snippet.site
+      assert_redirected_to action: :edit, id: snippet
       assert_equal 'Snippet created', flash[:success]
     end
   end
 
   def test_creation_failure
     assert_no_difference 'Comfy::Cms::Snippet.count' do
-      post :create, :site_id => comfy_cms_sites(:default), :snippet => { }
+      r :post, comfy_admin_cms_site_snippets_path(site_id: @site), params: {snippet: { }}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create snippet', flash[:danger]
@@ -95,50 +99,50 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
   end
 
   def test_update
-    snippet = comfy_cms_snippets(:default)
-    put :update, :site_id => snippet.site, :id => snippet, :snippet => {
-      :label    => 'New-Snippet',
-      :content  => 'New Content'
-    }
+    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
+      label:   'New-Snippet',
+      content: 'New Content'
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :edit, :site_id => snippet.site, :id => snippet
+    assert_redirected_to action: :edit, site_id: @site, id: @snippet
     assert_equal 'Snippet updated', flash[:success]
-    snippet.reload
-    assert_equal 'New-Snippet', snippet.label
-    assert_equal 'New Content', snippet.content
+    @snippet.reload
+    assert_equal 'New-Snippet', @snippet.label
+    assert_equal 'New Content', @snippet.content
   end
 
   def test_update_failure
-    snippet = comfy_cms_snippets(:default)
-    put :update, :site_id => snippet.site, :id => snippet, :snippet => {
-      :identifier => ''
-    }
+    r :put, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet), params: {snippet: {
+      identifier: ''
+    }}
     assert_response :success
     assert_template :edit
-    snippet.reload
-    assert_not_equal '', snippet.identifier
+    @snippet.reload
+    assert_not_equal '', @snippet.identifier
     assert_equal 'Failed to update snippet', flash[:danger]
   end
 
   def test_destroy
     assert_difference 'Comfy::Cms::Snippet.count', -1 do
-      delete :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_snippets(:default)
+      r :delete, comfy_admin_cms_site_snippet_path(site_id: @site, id: @snippet)
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal 'Snippet deleted', flash[:success]
     end
   end
 
   def test_reorder
-    snippet_one = comfy_cms_snippets(:default)
-    snippet_two = comfy_cms_sites(:default).snippets.create!(
-      :label      => 'test',
-      :identifier => 'test'
+    snippet_one = @snippet
+    snippet_two = @site.snippets.create!(
+      label:      'test',
+      identifier: 'test'
     )
     assert_equal 0, snippet_one.position
     assert_equal 1, snippet_two.position
 
-    post :reorder, :site_id => comfy_cms_sites(:default), :comfy_cms_snippet => [snippet_two.id, snippet_one.id]
+    r :put, reorder_comfy_admin_cms_site_snippets_path(site_id: @site), params: {
+      comfy_cms_snippet: [snippet_two.id, snippet_one.id]
+    }
     assert_response :success
     snippet_one.reload
     snippet_two.reload
@@ -146,5 +150,4 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
     assert_equal 1, snippet_one.position
     assert_equal 0, snippet_two.position
   end
-
 end