FEATURE: Support subfolders in SiteSetting.s3_backup_bucket.

spec/models/backup_spec.rb

@@ -1,4 +1,5 @@
 require 'rails_helper'
+require "s3_helper"
 
 require_dependency 'backup'
 
@@ -28,11 +29,58 @@ describe Backup do
     end
   end
 
+  shared_context 's3 helpers' do
+    let(:client) { Aws::S3::Client.new(stub_responses: true) }
+    let(:resource) { Aws::S3::Resource.new(client: client) }
+    let!(:s3_bucket) { resource.bucket("s3-upload-bucket") }
+    let(:s3_helper) { b1.s3 }
+
+    before(:each) do
+      SiteSetting.s3_backup_bucket = "s3-upload-bucket"
+      SiteSetting.s3_access_key_id = "s3-access-key-id"
+      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+    end
+  end
+
   context ".after_create_hook" do
-    it "calls upload_to_s3 if the SiteSetting is true" do
-      SiteSetting.enable_s3_backups = true
-      b1.expects(:upload_to_s3).once
-      b1.after_create_hook
+    context "when SiteSetting is true" do
+      include_context "s3 helpers"
+
+      before do
+        SiteSetting.enable_s3_backups = true
+      end
+
+      it "should upload the backup to S3 with the right paths" do
+        b1.path = 'some/path/backup.gz'
+        File.expects(:open).with(b1.path).yields(stub)
+
+        s3_helper.expects(:s3_bucket).returns(s3_bucket)
+        s3_object = stub
+
+        s3_bucket.expects(:object).with(b1.filename).returns(s3_object)
+        s3_object.expects(:upload_file)
+
+        b1.after_create_hook
+      end
+
+      context "when s3_backup_bucket includes folders path" do
+        before do
+          SiteSetting.s3_backup_bucket = "s3-upload-bucket/discourse-backups"
+        end
+
+        it "should upload the backup to S3 with the right paths" do
+          b1.path = 'some/path/backup.gz'
+          File.expects(:open).with(b1.path).yields(stub)
+
+          s3_helper.expects(:s3_bucket).returns(s3_bucket)
+          s3_object = stub
+
+          s3_bucket.expects(:object).with("discourse-backups/#{b1.filename}").returns(s3_object)
+          s3_object.expects(:upload_file)
+
+          b1.after_create_hook
+        end
+      end
     end
 
     it "calls upload_to_s3 if the SiteSetting is false" do
@@ -43,10 +91,38 @@ describe Backup do
   end
 
   context ".after_remove_hook" do
-    it "calls remove_from_s3 if the SiteSetting is true" do
-      SiteSetting.enable_s3_backups = true
-      b1.expects(:remove_from_s3).once
-      b1.after_remove_hook
+    include_context "s3 helpers"
+
+    context "when SiteSetting is true" do
+      before do
+        SiteSetting.enable_s3_backups = true
+      end
+
+      it "should upload the backup to S3 with the right paths" do
+        s3_helper.expects(:s3_bucket).returns(s3_bucket)
+        s3_object = stub
+
+        s3_bucket.expects(:object).with(b1.filename).returns(s3_object)
+        s3_object.expects(:delete)
+
+        b1.after_remove_hook
+      end
+
+      context "when s3_backup_bucket includes folders path" do
+        before do
+          SiteSetting.s3_backup_bucket = "s3-upload-bucket/discourse-backups"
+        end
+
+        it "should upload the backup to S3 with the right paths" do
+          s3_helper.expects(:s3_bucket).returns(s3_bucket)
+          s3_object = stub
+
+          s3_bucket.expects(:object).with("discourse-backups/#{b1.filename}").returns(s3_object)
+          s3_object.expects(:delete)
+
+          b1.after_remove_hook
+        end
+      end
     end
 
     it "calls remove_from_s3 if the SiteSetting is false" do