aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/attachments_test.rb24
-rw-r--r--test/blob_test.rb6
-rw-r--r--test/database/create_users_migration.rb2
-rw-r--r--test/database/setup.rb6
-rw-r--r--test/disk_controller_test.rb14
-rw-r--r--test/filename_test.rb12
-rw-r--r--test/site/disk_site_test.rb6
-rw-r--r--test/site/gcs_site_test.rb6
-rw-r--r--test/site/mirror_site_test.rb19
-rw-r--r--test/site/s3_site_test.rb6
-rw-r--r--test/site/shared_site_tests.rb2
-rw-r--r--test/test_helper.rb18
-rw-r--r--test/verified_key_with_expiration_test.rb12
13 files changed, 63 insertions, 70 deletions
diff --git a/test/attachments_test.rb b/test/attachments_test.rb
index 1b784b50c1..6e25002bb1 100644
--- a/test/attachments_test.rb
+++ b/test/attachments_test.rb
@@ -1,6 +1,6 @@
require "test_helper"
require "database/setup"
-require "active_vault/blob"
+require "active_storage/blob"
require "active_job"
ActiveJob::Base.queue_adapter = :test
@@ -13,12 +13,12 @@ class User < ActiveRecord::Base
has_many_attached :highlights
end
-class ActiveVault::AttachmentsTest < ActiveSupport::TestCase
+class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
include ActiveJob::TestHelper
setup { @user = User.create!(name: "DHH") }
- teardown { ActiveVault::Blob.all.each(&:purge) }
+ teardown { ActiveStorage::Blob.all.each(&:purge) }
test "attach existing blob" do
@user.avatar.attach create_blob(filename: "funky.jpg")
@@ -36,7 +36,7 @@ class ActiveVault::AttachmentsTest < ActiveSupport::TestCase
@user.avatar.purge
assert_not @user.avatar.attached?
- assert_not ActiveVault::Blob.site.exist?(avatar_key)
+ assert_not ActiveStorage::Blob.site.exist?(avatar_key)
end
test "purge attached blob later when the record is destroyed" do
@@ -46,8 +46,8 @@ class ActiveVault::AttachmentsTest < ActiveSupport::TestCase
perform_enqueued_jobs do
@user.destroy
- assert_nil ActiveVault::Blob.find_by(key: avatar_key)
- assert_not ActiveVault::Blob.site.exist?(avatar_key)
+ assert_nil ActiveStorage::Blob.find_by(key: avatar_key)
+ assert_not ActiveStorage::Blob.site.exist?(avatar_key)
end
end
@@ -74,8 +74,8 @@ class ActiveVault::AttachmentsTest < ActiveSupport::TestCase
@user.highlights.purge
assert_not @user.highlights.attached?
- assert_not ActiveVault::Blob.site.exist?(highlight_keys.first)
- assert_not ActiveVault::Blob.site.exist?(highlight_keys.second)
+ assert_not ActiveStorage::Blob.site.exist?(highlight_keys.first)
+ assert_not ActiveStorage::Blob.site.exist?(highlight_keys.second)
end
test "purge attached blobs later when the record is destroyed" do
@@ -85,11 +85,11 @@ class ActiveVault::AttachmentsTest < ActiveSupport::TestCase
perform_enqueued_jobs do
@user.destroy
- assert_nil ActiveVault::Blob.find_by(key: highlight_keys.first)
- assert_not ActiveVault::Blob.site.exist?(highlight_keys.first)
+ assert_nil ActiveStorage::Blob.find_by(key: highlight_keys.first)
+ assert_not ActiveStorage::Blob.site.exist?(highlight_keys.first)
- assert_nil ActiveVault::Blob.find_by(key: highlight_keys.second)
- assert_not ActiveVault::Blob.site.exist?(highlight_keys.second)
+ assert_nil ActiveStorage::Blob.find_by(key: highlight_keys.second)
+ assert_not ActiveStorage::Blob.site.exist?(highlight_keys.second)
end
end
end
diff --git a/test/blob_test.rb b/test/blob_test.rb
index c7b4aeed39..880c656ecc 100644
--- a/test/blob_test.rb
+++ b/test/blob_test.rb
@@ -1,8 +1,8 @@
require "test_helper"
require "database/setup"
-require "active_vault/blob"
+require "active_storage/blob"
-class ActiveVault::BlobTest < ActiveSupport::TestCase
+class ActiveStorage::BlobTest < ActiveSupport::TestCase
test "create after upload sets byte size and checksum" do
data = "Hello world!"
blob = create_blob data: data
@@ -23,6 +23,6 @@ class ActiveVault::BlobTest < ActiveSupport::TestCase
private
def expected_url_for(blob, disposition: :inline)
- "/rails/blobs/#{ActiveVault::VerifiedKeyWithExpiration.encode(blob.key, expires_in: 5.minutes)}?disposition=#{disposition}"
+ "/rails/blobs/#{ActiveStorage::VerifiedKeyWithExpiration.encode(blob.key, expires_in: 5.minutes)}?disposition=#{disposition}"
end
end
diff --git a/test/database/create_users_migration.rb b/test/database/create_users_migration.rb
index 38dcdc129b..15be1938a9 100644
--- a/test/database/create_users_migration.rb
+++ b/test/database/create_users_migration.rb
@@ -1,4 +1,4 @@
-class ActiveVault::CreateUsers < ActiveRecord::Migration[5.1]
+class ActiveStorage::CreateUsers < ActiveRecord::Migration[5.1]
def change
create_table :users do |t|
t.string :name
diff --git a/test/database/setup.rb b/test/database/setup.rb
index 7373d72237..828edd86dd 100644
--- a/test/database/setup.rb
+++ b/test/database/setup.rb
@@ -1,6 +1,6 @@
-require "active_vault/migration"
+require "active_storage/migration"
require_relative "create_users_migration"
ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-ActiveVault::CreateTables.migrate(:up)
-ActiveVault::CreateUsers.migrate(:up)
+ActiveStorage::CreateTables.migrate(:up)
+ActiveStorage::CreateUsers.migrate(:up)
diff --git a/test/disk_controller_test.rb b/test/disk_controller_test.rb
index eaf0b497ac..3d7f4ba6bd 100644
--- a/test/disk_controller_test.rb
+++ b/test/disk_controller_test.rb
@@ -4,30 +4,30 @@ require "database/setup"
require "action_controller"
require "action_controller/test_case"
-require "active_vault/disk_controller"
-require "active_vault/verified_key_with_expiration"
+require "active_storage/disk_controller"
+require "active_storage/verified_key_with_expiration"
-class ActiveVault::DiskControllerTest < ActionController::TestCase
+class ActiveStorage::DiskControllerTest < ActionController::TestCase
Routes = ActionDispatch::Routing::RouteSet.new.tap do |routes|
routes.draw do
- get "/rails/blobs/:encoded_key" => "active_vault/disk#show", as: :rails_disk_blob
+ get "/rails/blobs/:encoded_key" => "active_storage/disk#show", as: :rails_disk_blob
end
end
setup do
@blob = create_blob
@routes = Routes
- @controller = ActiveVault::DiskController.new
+ @controller = ActiveStorage::DiskController.new
end
test "showing blob inline" do
- get :show, params: { encoded_key: ActiveVault::VerifiedKeyWithExpiration.encode(@blob.key, expires_in: 5.minutes) }
+ get :show, params: { 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: { encoded_key: ActiveVault::VerifiedKeyWithExpiration.encode(@blob.key, expires_in: 5.minutes), disposition: :attachment }
+ get :show, params: { 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
diff --git a/test/filename_test.rb b/test/filename_test.rb
index 5cb67016c0..448ba7f766 100644
--- a/test/filename_test.rb
+++ b/test/filename_test.rb
@@ -1,9 +1,9 @@
require "test_helper"
-class ActiveVault::FilenameTest < ActiveSupport::TestCase
+class ActiveStorage::FilenameTest < ActiveSupport::TestCase
test "sanitize" do
"%$|:;/\t\r\n\\".each_char do |character|
- filename = ActiveVault::Filename.new("foo#{character}bar.pdf")
+ filename = ActiveStorage::Filename.new("foo#{character}bar.pdf")
assert_equal 'foo-bar.pdf', filename.sanitized
assert_equal 'foo-bar.pdf', filename.to_s
end
@@ -16,21 +16,21 @@ class ActiveVault::FilenameTest < ActiveSupport::TestCase
"\xCF" => "�",
"\x00" => "",
}.each do |actual, expected|
- assert_equal expected, ActiveVault::Filename.new(actual).sanitized
+ assert_equal expected, ActiveStorage::Filename.new(actual).sanitized
end
end
test "strips RTL override chars used to spoof unsafe executables as docs" do
# Would be displayed in Windows as "evilexe.pdf" due to the right-to-left
# (RTL) override char!
- assert_equal 'evil-fdp.exe', ActiveVault::Filename.new("evil\u{202E}fdp.exe").sanitized
+ assert_equal 'evil-fdp.exe', ActiveStorage::Filename.new("evil\u{202E}fdp.exe").sanitized
end
test "compare case-insensitively" do
- assert_operator ActiveVault::Filename.new('foobar.pdf'), :==, ActiveVault::Filename.new('FooBar.PDF')
+ assert_operator ActiveStorage::Filename.new('foobar.pdf'), :==, ActiveStorage::Filename.new('FooBar.PDF')
end
test "compare sanitized" do
- assert_operator ActiveVault::Filename.new('foo-bar.pdf'), :==, ActiveVault::Filename.new("foo\tbar.pdf")
+ assert_operator ActiveStorage::Filename.new('foo-bar.pdf'), :==, ActiveStorage::Filename.new("foo\tbar.pdf")
end
end
diff --git a/test/site/disk_site_test.rb b/test/site/disk_site_test.rb
index e9ebdcb0be..a04414ea68 100644
--- a/test/site/disk_site_test.rb
+++ b/test/site/disk_site_test.rb
@@ -1,8 +1,8 @@
require "tmpdir"
require "site/shared_site_tests"
-class ActiveVault::Site::DiskSiteTest < ActiveSupport::TestCase
- SITE = ActiveVault::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_vault"))
+class ActiveStorage::Site::DiskSiteTest < ActiveSupport::TestCase
+ SITE = ActiveStorage::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_storage"))
- include ActiveVault::Site::SharedSiteTests
+ include ActiveStorage::Site::SharedSiteTests
end
diff --git a/test/site/gcs_site_test.rb b/test/site/gcs_site_test.rb
index b3712a2116..98b1a3d767 100644
--- a/test/site/gcs_site_test.rb
+++ b/test/site/gcs_site_test.rb
@@ -1,10 +1,10 @@
require "site/shared_site_tests"
if SITE_CONFIGURATIONS[:gcs]
- class ActiveVault::Site::GCSSiteTest < ActiveSupport::TestCase
- SITE = ActiveVault::Site.configure(:GCS, SITE_CONFIGURATIONS[:gcs])
+ class ActiveStorage::Site::GCSSiteTest < ActiveSupport::TestCase
+ SITE = ActiveStorage::Site.configure(:GCS, SITE_CONFIGURATIONS[:gcs])
- include ActiveVault::Site::SharedSiteTests
+ include ActiveStorage::Site::SharedSiteTests
test "signed URL generation" do
travel_to Time.now do
diff --git a/test/site/mirror_site_test.rb b/test/site/mirror_site_test.rb
index bdb0b4c357..7ced377cde 100644
--- a/test/site/mirror_site_test.rb
+++ b/test/site/mirror_site_test.rb
@@ -1,15 +1,15 @@
require "tmpdir"
require "site/shared_site_tests"
-class ActiveVault::Site::MirrorSiteTest < ActiveSupport::TestCase
- PRIMARY_DISK_SITE = ActiveVault::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_vault"))
- SECONDARY_DISK_SITE = ActiveVault::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_vault_mirror"))
+class ActiveStorage::Site::MirrorSiteTest < ActiveSupport::TestCase
+ PRIMARY_DISK_SITE = ActiveStorage::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_storage"))
+ SECONDARY_DISK_SITE = ActiveStorage::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_storage_mirror"))
- SITE = ActiveVault::Site.configure :Mirror, sites: [ PRIMARY_DISK_SITE, SECONDARY_DISK_SITE ]
+ SITE = ActiveStorage::Site.configure :Mirror, sites: [ PRIMARY_DISK_SITE, SECONDARY_DISK_SITE ]
- include ActiveVault::Site::SharedSiteTests
+ include ActiveStorage::Site::SharedSiteTests
- test "uploading to all sites" do
+ test "uploading was done to all sites" do
begin
key = SecureRandom.base58(24)
data = "Something else entirely!"
@@ -27,11 +27,4 @@ class ActiveVault::Site::MirrorSiteTest < ActiveSupport::TestCase
assert PRIMARY_DISK_SITE.exist?(FIXTURE_KEY)
assert SECONDARY_DISK_SITE.exist?(FIXTURE_KEY)
end
-
- test "URL generation for primary site" do
- travel_to Time.now do
- assert_equal PRIMARY_DISK_SITE.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "test.txt"),
- SITE.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "test.txt")
- end
- end
end
diff --git a/test/site/s3_site_test.rb b/test/site/s3_site_test.rb
index 6daeaac2ea..a9cb6ca618 100644
--- a/test/site/s3_site_test.rb
+++ b/test/site/s3_site_test.rb
@@ -1,10 +1,10 @@
require "site/shared_site_tests"
if SITE_CONFIGURATIONS[:s3]
- class ActiveVault::Site::S3SiteTest < ActiveSupport::TestCase
- SITE = ActiveVault::Site.configure(:S3, SITE_CONFIGURATIONS[:s3])
+ class ActiveStorage::Site::S3SiteTest < ActiveSupport::TestCase
+ SITE = ActiveStorage::Site.configure(:S3, SITE_CONFIGURATIONS[:s3])
- include ActiveVault::Site::SharedSiteTests
+ include ActiveStorage::Site::SharedSiteTests
end
else
puts "Skipping S3 Site tests because no S3 configuration was supplied"
diff --git a/test/site/shared_site_tests.rb b/test/site/shared_site_tests.rb
index 56f1a13742..687c35e941 100644
--- a/test/site/shared_site_tests.rb
+++ b/test/site/shared_site_tests.rb
@@ -8,7 +8,7 @@ rescue Errno::ENOENT
puts "Missing site configuration file in test/sites/configurations.yml"
end
-module ActiveVault::Site::SharedSiteTests
+module ActiveStorage::Site::SharedSiteTests
extend ActiveSupport::Concern
FIXTURE_KEY = SecureRandom.base58(24)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b18613c365..f354a995e4 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,25 +4,25 @@ require "active_support/test_case"
require "active_support/testing/autorun"
require "byebug"
-require "active_vault"
+require "active_storage"
-require "active_vault/site"
-ActiveVault::Blob.site = ActiveVault::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_vault"))
+require "active_storage/site"
+ActiveStorage::Blob.site = ActiveStorage::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_storage"))
-require "active_vault/verified_key_with_expiration"
-ActiveVault::VerifiedKeyWithExpiration.verifier = ActiveSupport::MessageVerifier.new("Testing")
+require "active_storage/verified_key_with_expiration"
+ActiveStorage::VerifiedKeyWithExpiration.verifier = ActiveSupport::MessageVerifier.new("Testing")
class ActiveSupport::TestCase
private
def create_blob(data: "Hello world!", filename: "hello.txt", content_type: "text/plain")
- ActiveVault::Blob.create_after_upload! io: StringIO.new(data), filename: filename, content_type: content_type
+ ActiveStorage::Blob.create_after_upload! io: StringIO.new(data), filename: filename, content_type: content_type
end
end
-require "active_vault/attached"
-ActiveRecord::Base.send :extend, ActiveVault::Attached::Macros
+require "active_storage/attached"
+ActiveRecord::Base.send :extend, ActiveStorage::Attached::Macros
require "global_id"
-GlobalID.app = "ActiveVaultExampleApp"
+GlobalID.app = "ActiveStorageExampleApp"
ActiveRecord::Base.send :include, GlobalID::Identification
diff --git a/test/verified_key_with_expiration_test.rb b/test/verified_key_with_expiration_test.rb
index 073bb047f6..ee4dc7e02e 100644
--- a/test/verified_key_with_expiration_test.rb
+++ b/test/verified_key_with_expiration_test.rb
@@ -1,19 +1,19 @@
require "test_helper"
require "active_support/core_ext/securerandom"
-class ActiveVault::VerifiedKeyWithExpirationTest < ActiveSupport::TestCase
+class ActiveStorage::VerifiedKeyWithExpirationTest < ActiveSupport::TestCase
FIXTURE_KEY = SecureRandom.base58(24)
test "without expiration" do
- encoded_key = ActiveVault::VerifiedKeyWithExpiration.encode(FIXTURE_KEY)
- assert_equal FIXTURE_KEY, ActiveVault::VerifiedKeyWithExpiration.decode(encoded_key)
+ encoded_key = ActiveStorage::VerifiedKeyWithExpiration.encode(FIXTURE_KEY)
+ assert_equal FIXTURE_KEY, ActiveStorage::VerifiedKeyWithExpiration.decode(encoded_key)
end
test "with expiration" do
- encoded_key = ActiveVault::VerifiedKeyWithExpiration.encode(FIXTURE_KEY, expires_in: 1.minute)
- assert_equal FIXTURE_KEY, ActiveVault::VerifiedKeyWithExpiration.decode(encoded_key)
+ encoded_key = ActiveStorage::VerifiedKeyWithExpiration.encode(FIXTURE_KEY, expires_in: 1.minute)
+ assert_equal FIXTURE_KEY, ActiveStorage::VerifiedKeyWithExpiration.decode(encoded_key)
travel 2.minutes
- assert_nil ActiveVault::VerifiedKeyWithExpiration.decode(encoded_key)
+ assert_nil ActiveStorage::VerifiedKeyWithExpiration.decode(encoded_key)
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 07:43:50 +0000