Merge pull request #67 from dixpac/move_controller_tests

Move all controller tests to controllers dir

2 files changed, 91 insertions, 0 deletions

diff --git a/test/controllers/direct_uploads_controller_test.rb b/test/controllers/direct_uploads_controller_test.rb
new file mode 100644
index 0000000000..8aa61f53cb
--- /dev/null
+++ b/test/controllers/direct_uploads_controller_test.rb
@@ -0,0 +1,66 @@
+require "test_helper"
+require "database/setup"
+
+require "action_controller"
+require "action_controller/test_case"
+
+require "active_storage/direct_uploads_controller"
+
+if SERVICE_CONFIGURATIONS[:s3]
+  class ActiveStorage::S3DirectUploadsControllerTest < ActionController::TestCase
+    setup do
+      @blob = create_blob
+      @routes = Routes
+      @controller = ActiveStorage::DirectUploadsController.new
+
+      @old_service = ActiveStorage::Blob.service
+      ActiveStorage::Blob.service = ActiveStorage::Service.configure(:s3, SERVICE_CONFIGURATIONS)
+    end
+
+    teardown do
+      ActiveStorage::Blob.service = @old_service
+    end
+
+    test "creating new direct upload" do
+      post :create, params: { blob: {
+          filename: "hello.txt", byte_size: 6, checksum: Digest::MD5.base64digest("Hello"), content_type: "text/plain" } }
+
+      details = JSON.parse(@response.body)
+
+      assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws\.com/, details["url"]
+      assert_equal "hello.txt", GlobalID::Locator.locate_signed(details["sgid"]).filename.to_s
+    end
+  end
+else
+  puts "Skipping S3 Direct Upload tests because no S3 configuration was supplied"
+end
+
+if SERVICE_CONFIGURATIONS[:gcs]
+  class ActiveStorage::GCSDirectUploadsControllerTest < ActionController::TestCase
+    setup do
+      @blob = create_blob
+      @routes = Routes
+      @controller = ActiveStorage::DirectUploadsController.new
+      @config = SERVICE_CONFIGURATIONS[:gcs]
+
+      @old_service = ActiveStorage::Blob.service
+      ActiveStorage::Blob.service = ActiveStorage::Service.configure(:gcs, SERVICE_CONFIGURATIONS)
+    end
+
+    teardown do
+      ActiveStorage::Blob.service = @old_service
+    end
+
+    test "creating new direct upload" do
+      post :create, params: { blob: {
+          filename: "hello.txt", byte_size: 6, checksum: Digest::MD5.base64digest("Hello"), content_type: "text/plain" } }
+
+      details = JSON.parse(@response.body)
+
+      assert_match %r{storage\.googleapis\.com/#{@config[:bucket]}}, details["url"]
+      assert_equal "hello.txt", GlobalID::Locator.locate_signed(details["sgid"]).filename.to_s
+    end
+  end
+else
+  puts "Skipping GCS Direct Upload tests because no GCS configuration was supplied"
+end
diff --git a/test/controllers/disk_controller_test.rb b/test/controllers/disk_controller_test.rb
new file mode 100644
index 0000000000..834ad1bfd9
--- /dev/null
+++ b/test/controllers/disk_controller_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+require "database/setup"
+
+require "active_storage/disk_controller"
+require "active_storage/verified_key_with_expiration"
+
+class ActiveStorage::DiskControllerTest < ActionController::TestCase
+  setup do
+    @blob = create_blob
+    @routes = Routes
+    @controller = ActiveStorage::DiskController.new
+  end
+
+  test "showing blob inline" do
+    get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage::VerifiedKeyWithExpiration.encode(@blob.key, expires_in: 5.minutes) }
+    assert_equal "inline; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"]
+    assert_equal "text/plain", @response.headers["Content-Type"]
+  end
+
+  test "sending blob as attachment" do
+    get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage::VerifiedKeyWithExpiration.encode(@blob.key, expires_in: 5.minutes), disposition: :attachment }
+    assert_equal "attachment; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"]
+    assert_equal "text/plain", @response.headers["Content-Type"]
+  end
+end