test/unit/test_storage.rb in spontaneous-0.2.0.beta4 vs test/unit/test_storage.rb in spontaneous-0.2.0.beta5

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 
 require File.expand_path('../../test_helper', __FILE__)
 require 'fog'
 
-describe "Storage" do
+describe "Media Store" do
   before do
     @site = setup_site
     @config_dir = File.expand_path("../../fixtures/storage", __FILE__)
   end
 
@@ -20,11 +20,11 @@
       # sanity check
       assert @site.config.test_setting
       @storage = @site.storage
     end
     it "be the default" do
-      @storage.must_be_instance_of Spontaneous::Storage::Local
+      @storage.must_be_instance_of Spontaneous::Media::Store::Local
     end
     it "have the right base url" do
       @storage.public_url("test.jpg").must_equal "/media/test.jpg"
     end
     it "test for locality" do
@@ -44,20 +44,23 @@
         :aws_secret_access_key=>"SECRET_ACCESS_KEY",
         :aws_access_key_id=>"ACCESS_KEY_ID"
       }
       ::Fog.mock!
       @connection = Fog::Storage.new(@aws_credentials)
-      @bucket = @connection.directories.create(:key => @bucket_name)
+      @bucket = @connection.directories.create(key: @bucket_name)
       @site.paths.add :config, File.expand_path(@config_dir / "cloud", __FILE__)
       @site.load_config!
       # sanity check
       assert @site.config.test_setting
       @storage = @site.storage
+      # Fog's mocks used to apply directory additions globally but latest version
+      # doesn't so I have to stub it out :(
+      @storage.stubs(:backend).returns(@connection)
     end
 
     it "be detected by configuration" do
-      @storage.must_be_instance_of Spontaneous::Storage::Cloud
+      @storage.must_be_instance_of Spontaneous::Media::Store::Cloud
     end
 
     it "have the correct bucket name" do
       @storage.bucket_name.must_equal "media.example.com"
     end
@@ -84,11 +87,11 @@
         file.cache_control.must_equal "max-age=31557600, public"
       end
 
       it "be set as publicly visible" do
         file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg" })
-        acl = file.connection.get_object_acl(file.directory.key, file.key).body['AccessControlList']
+        acl = file.service.get_object_acl(file.directory.key, file.key).body['AccessControlList']
         perms = acl.detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' }
         perms["Permission"].must_equal "READ"
       end
 
       it "sets any additional headers passed to the copy method" do
@@ -108,10 +111,10 @@
         @storage.public_url(@media_path).must_equal "https://media.example.com.s3.amazonaws.com/0003/0567/rose.jpg"
       end
 
 
       it "use custom urls if configured" do
-        storage = Spontaneous::Storage::Cloud.new(@aws_credentials.merge({
+        storage = Spontaneous::Media::Store::Cloud.new(@aws_credentials.merge({
           :public_host => "http://media.example.com",
         }), @bucket_name)
         storage.public_url(@media_path).must_equal "http://media.example.com/0003/0567/rose.jpg"
       end
     end