github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add a tombstone for extra safety

Browse Source
This commit is contained in:
Régis Hanol
2013-11-27 22:01:41 +01:00
parent 8a62381268
commit 52160179f8
15 changed files with 231 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spec/components/file_store/local_store_spec.rb
View File

@ -48,14 +48,15 @@ describe FileStore::LocalStore do
describe ".remove_upload" do
it "does not delete non uploaded" do
File.expects(:delete).never
FileUtils.expects(:mkdir_p).never
upload = Upload.new
upload.stubs(:url).returns("/path/to/file")
store.remove_upload(upload)
end
it "deletes the file locally" do
File.expects(:delete)
it "moves the file to the tombstone" do
FileUtils.expects(:mkdir_p)
FileUtils.expects(:move)
upload = Upload.new
upload.stubs(:url).returns("/uploads/default/42/253dc8edf9d4ada1.png")
store.remove_upload(upload)
@ -65,11 +66,12 @@ describe FileStore::LocalStore do
describe ".remove_optimized_image" do
it "deletes the file locally" do
File.expects(:delete)
it "moves the file to the tombstone" do
FileUtils.expects(:mkdir_p)
FileUtils.expects(:move)
oi = OptimizedImage.new
oi.stubs(:url).returns("/uploads/default/_optimized/42/253dc8edf9d4ada1.png")
store.remove_upload(upload)
store.remove_optimized_image(upload)
end
end

2
spec/components/file_store/s3_store_spec.rb
View File

@ -35,6 +35,8 @@ describe FileStore::S3Store do
SiteSetting.stubs(:s3_access_key_id).returns("s3_access_key_id")
SiteSetting.stubs(:s3_secret_access_key).returns("s3_secret_access_key")
Fog.mock!
Fog::Mock.reset
Fog::Mock.delay = 0
end
after(:each) { Fog.unmock! }