From 01aab733bb4c5fe37d1f0b46fa2fb885bf838cec Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 22 Feb 2024 13:31:09 -0600 Subject: [PATCH] remove extra purge cache for html file create --- app/site_files.rb | 2 +- models/site.rb | 1 - tests/site_file_tests.rb | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/site_files.rb b/app/site_files.rb index 4c04aa5b..f183dacc 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -14,7 +14,7 @@ post '/site_files/create' do require_login @errors = [] - filename = params[:pagefilename] || params[:filename] + filename = params[:filename] filename.gsub!(/[^a-zA-Z0-9_\-.]/, '') diff --git a/models/site.rb b/models/site.rb index 7b24a55b..f7b246a0 100644 --- a/models/site.rb +++ b/models/site.rb @@ -850,7 +850,6 @@ class Site < Sequel::Model tmpfile.write render_template('index.erb') tmpfile.close store_files [{filename: path, tempfile: tmpfile}] - purge_cache path tmpfile.unlink end diff --git a/tests/site_file_tests.rb b/tests/site_file_tests.rb index 95c1a490..e2f5b916 100644 --- a/tests/site_file_tests.rb +++ b/tests/site_file_tests.rb @@ -24,6 +24,20 @@ describe 'site_files' do ScreenshotWorker.jobs.clear end + describe 'install' do + it 'installs new html file' do + post '/site_files/create', {filename: 'test.html', csrf_token: 'abcd'}, {'rack.session' => { 'id' => @site.id, '_csrf_token' => 'abcd' }} + _(last_response.body).must_equal "" + _(last_response.status).must_equal 302 + _(last_response.headers['Location']).must_match /dashboard/ + testfile = @site.site_files_dataset.where(path: 'test.html').first + _(testfile).wont_equal nil + _(File.exists?(@site.files_path('test.html'))).must_equal true + _(PurgeCacheWorker.jobs.length).must_equal 1 + _(PurgeCacheWorker.jobs.first['args'].last).must_equal '/test' + end + end + describe 'rename' do before do PurgeCacheWorker.jobs.clear