Use lazy-loaded factory method for site configuration

10 files changed, 32 insertions, 32 deletions

diff --git a/test/sites/.gitignore b/test/site/.gitignore
index c102131f3d..c102131f3d 100644
--- a/test/sites/.gitignore
+++ b/test/site/.gitignore
diff --git a/test/sites/configurations-example.yml b/test/site/configurations-example.yml
index 031197342a..031197342a 100644
--- a/test/sites/configurations-example.yml
+++ b/test/site/configurations-example.yml
diff --git a/test/site/disk_site_test.rb b/test/site/disk_site_test.rb
new file mode 100644
index 0000000000..63f12ad335
--- /dev/null
+++ b/test/site/disk_site_test.rb
@@ -0,0 +1,8 @@
+require "tmpdir"
+require "site/shared_site_tests"
+
+class ActiveFile::Site::DiskSiteTest < ActiveSupport::TestCase
+  SITE = ActiveFile::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_file"))
+
+  include ActiveFile::Site::SharedSiteTests
+end
diff --git a/test/site/gcs_site_test.rb b/test/site/gcs_site_test.rb
new file mode 100644
index 0000000000..c5f32a0595
--- /dev/null
+++ b/test/site/gcs_site_test.rb
@@ -0,0 +1,11 @@
+require "site/shared_site_tests"
+
+if SITE_CONFIGURATIONS[:gcs]
+  class ActiveFile::Site::GCSSiteTest < ActiveSupport::TestCase
+    SITE = ActiveFile::Site.configure(:GCS, SITE_CONFIGURATIONS[:gcs])
+
+    include ActiveFile::Site::SharedSiteTests
+  end
+else
+  puts "Skipping GCS Site tests because no GCS configuration was supplied"
+end
diff --git a/test/site/s3_site_test.rb b/test/site/s3_site_test.rb
new file mode 100644
index 0000000000..7629b78ad5
--- /dev/null
+++ b/test/site/s3_site_test.rb
@@ -0,0 +1,11 @@
+require "site/shared_site_tests"
+
+if SITE_CONFIGURATIONS[:s3]
+  class ActiveFile::Site::S3SiteTest < ActiveSupport::TestCase
+    SITE = ActiveFile::Site.configure(:S3, SITE_CONFIGURATIONS[:s3])
+
+    include ActiveFile::Site::SharedSiteTests
+  end
+else
+  puts "Skipping S3 Site tests because no S3 configuration was supplied"
+end
diff --git a/test/sites/shared_site_tests.rb b/test/site/shared_site_tests.rb
index de28d7ae63..de1a54b874 100644
--- a/test/sites/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 ActiveFile::Sites::SharedSiteTests
+module ActiveFile::Site::SharedSiteTests
   extend ActiveSupport::Concern
 
   FIXTURE_KEY  = SecureRandom.base58(24)
diff --git a/test/sites/disk_site_test.rb b/test/sites/disk_site_test.rb
deleted file mode 100644
index 0956f08528..0000000000
--- a/test/sites/disk_site_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "tmpdir"
-require "sites/shared_site_tests"
-
-class ActiveFile::Sites::DiskSiteTest < ActiveSupport::TestCase
-  SITE = ActiveFile::Sites::DiskSite.new(root: File.join(Dir.tmpdir, "active_file"))
-
-  include ActiveFile::Sites::SharedSiteTests
-end
diff --git a/test/sites/gcs_site_test.rb b/test/sites/gcs_site_test.rb
deleted file mode 100644
index fbf6c4a242..0000000000
--- a/test/sites/gcs_site_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "sites/shared_site_tests"
-
-if SITE_CONFIGURATIONS[:gcs]
-  class ActiveFile::Sites::GCSSiteTest < ActiveSupport::TestCase
-    SITE = ActiveFile::Sites::GCSSite.new(SITE_CONFIGURATIONS[:gcs])
-
-    include ActiveFile::Sites::SharedSiteTests
-  end
-else
-  puts "Skipping GCS Site tests because no GCS configuration was supplied"
-end
diff --git a/test/sites/s3_site_test.rb b/test/sites/s3_site_test.rb
deleted file mode 100644
index 12f5d084f6..0000000000
--- a/test/sites/s3_site_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "sites/shared_site_tests"
-
-if SITE_CONFIGURATIONS[:s3]
-  class ActiveFile::Sites::S3SiteTest < ActiveSupport::TestCase
-    SITE = ActiveFile::Sites::S3Site.new(SITE_CONFIGURATIONS[:s3])
-
-    include ActiveFile::Sites::SharedSiteTests
-  end
-else
-  puts "Skipping S3 Site tests because no S3 configuration was supplied"
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5be2631ceb..1f947fce90 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,7 +6,7 @@ require "byebug"
 require "active_file"
 
 require "active_file/site"
-ActiveFile::Blob.site = ActiveFile::Sites::DiskSite.new(root: File.join(Dir.tmpdir, "active_file"))
+ActiveFile::Blob.site = ActiveFile::Site.configure(:Disk, root: File.join(Dir.tmpdir, "active_file"))
 
 require "active_file/verified_key_with_expiration"
 ActiveFile::VerifiedKeyWithExpiration.verifier = ActiveSupport::MessageVerifier.new("Testing")