asset_sync 1.0.0 → 1.1.0

data/spec/unit/google_spec.rb

@@ -16,36 +16,36 @@ describe AssetSync do
     end
 
     it "should configure provider as Google" do
-      AssetSync.config.fog_provider.should == 'Google'
-      AssetSync.config.should be_google
+      expect(AssetSync.config.fog_provider).to eq('Google')
+      expect(AssetSync.config).to be_google
     end
 
     it "should should keep existing remote files" do
-      AssetSync.config.existing_remote_files?.should == true
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
     it "should configure google_storage_access_key_id" do
-      AssetSync.config.google_storage_access_key_id.should == "aaaa"
+      expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
     end
 
     it "should configure google_storage_secret_access_key" do
-      AssetSync.config.google_storage_secret_access_key.should == "bbbb"
+      expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
     end
 
     it "should configure fog_directory" do
-      AssetSync.config.fog_directory.should == "mybucket"
+      expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default gzip_compression to false" do
-      AssetSync.config.gzip_compression.should be_false
+      expect(AssetSync.config.gzip_compression).to be_falsey
     end
 
     it "should default manifest to false" do
-      AssetSync.config.manifest.should be_false
+      expect(AssetSync.config.manifest).to be_falsey
     end
   end
 
@@ -56,27 +56,27 @@ describe AssetSync do
     end
 
     it "should configure google_storage_access_key_id" do
-      AssetSync.config.google_storage_access_key_id.should == "xxxx"
+      expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
     end
 
     it "should configure google_storage_secret_access_key" do
-      AssetSync.config.google_storage_secret_access_key.should == "zzzz"
+      expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
     end
 
     it "should configure google_storage_access_key" do
-      AssetSync.config.fog_directory.should == "rails_app_test"
+      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
     end
 
     it "should configure google_storage_access_key" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default gzip_compression to false" do
-      AssetSync.config.gzip_compression.should be_false
+      expect(AssetSync.config.gzip_compression).to be_falsey
     end
 
     it "should default manifest to false" do
-      AssetSync.config.manifest.should be_false
+      expect(AssetSync.config.manifest).to be_falsey
     end
   end
 
@@ -92,7 +92,7 @@ describe AssetSync do
 
   describe 'with fail_silent configuration' do
     before(:each) do
-      AssetSync.stub(:stderr).and_return(StringIO.new)
+      allow(AssetSync).to receive(:stderr).and_return(StringIO.new)
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fail_silently = true
@@ -111,7 +111,7 @@ describe AssetSync do
     end
 
     it "config.gzip? should be true" do
-      AssetSync.config.gzip?.should be_true
+      expect(AssetSync.config.gzip?).to be_truthy
     end
   end
 
@@ -122,21 +122,21 @@ describe AssetSync do
     end
 
     it "config.manifest should be true" do
-      AssetSync.config.manifest.should be_true
+      expect(AssetSync.config.manifest).to be_truthy
     end
 
     it "config.manifest_path should default to public/assets.." do
-      AssetSync.config.manifest_path.should =~ /public\/assets\/manifest.yml/
+      expect(AssetSync.config.manifest_path).to match(/public\/assets\/manifest.yml/)
     end
 
     it "config.manifest_path should default to public/assets.." do
       Rails.application.config.assets.manifest = "/var/assets"
-      AssetSync.config.manifest_path.should == "/var/assets/manifest.yml"
+      expect(AssetSync.config.manifest_path).to eq("/var/assets/manifest.yml")
     end
 
     it "config.manifest_path should default to public/custom_assets.." do
       Rails.application.config.assets.prefix = 'custom_assets'
-      AssetSync.config.manifest_path.should =~ /public\/custom_assets\/manifest.yml/
+      expect(AssetSync.config.manifest_path).to match(/public\/custom_assets\/manifest.yml/)
     end
   end
 end

data/spec/unit/multi_mime_spec.rb

@@ -21,9 +21,8 @@ describe AssetSync::MultiMime do
   describe 'Mime::Type' do
 
     it 'should detect mime type' do
-      pending "Fails on Travis CI only as of https://travis-ci.org/rumblelabs/asset_sync/builds/4188196"
       require 'rails'
-      AssetSync::MultiMime.lookup('css').should == "text/css"
+      expect(AssetSync::MultiMime.lookup('css')).to eq("text/css")
     end
 
   end
@@ -32,7 +31,7 @@ describe AssetSync::MultiMime do
 
     it 'should detect mime type' do
       require 'rack/mime'
-      AssetSync::MultiMime.lookup('css').should == "text/css"
+      expect(AssetSync::MultiMime.lookup('css')).to eq("text/css")
     end
 
   end
@@ -41,9 +40,9 @@ describe AssetSync::MultiMime do
 
     it 'should detect mime type' do
       require 'mime/types'
-      AssetSync::MultiMime.lookup('css').should == "text/css"
+      expect(AssetSync::MultiMime.lookup('css')).to eq("text/css")
     end
 
   end
 
-end
+end

data/spec/unit/rackspace_spec.rb

@@ -18,40 +18,40 @@ describe AssetSync do
     end
 
     it "should configure provider as Rackspace" do
-      AssetSync.config.fog_provider.should == 'Rackspace'
-      AssetSync.config.should be_rackspace
+      expect(AssetSync.config.fog_provider).to eq('Rackspace')
+      expect(AssetSync.config).to be_rackspace
     end
 
     it "should keep existing remote files" do
-      AssetSync.config.existing_remote_files?.should == true
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
     it "should configure rackspace_username" do
-      AssetSync.config.rackspace_username.should == "aaaa"
+      expect(AssetSync.config.rackspace_username).to eq("aaaa")
     end
 
     it "should configure rackspace_api_key" do
-      AssetSync.config.rackspace_api_key.should == "bbbb"
+      expect(AssetSync.config.rackspace_api_key).to eq("bbbb")
     end
 
     it "should configure fog_directory" do
-      AssetSync.config.fog_directory.should == "mybucket"
+      expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
 
     it "should configure fog_region" do
-      AssetSync.config.fog_region.should == "dunno"
+      expect(AssetSync.config.fog_region).to eq("dunno")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default rackspace_auth_url to false" do
-      AssetSync.config.rackspace_auth_url.should be_false
+      expect(AssetSync.config.rackspace_auth_url).to be_falsey
     end
 
   end
@@ -64,27 +64,27 @@ describe AssetSync do
     end
 
     it "should keep existing remote files" do
-      AssetSync.config.existing_remote_files?.should == true
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
     it "should configure rackspace_username" do
-      AssetSync.config.rackspace_username.should == "xxxx"
+      expect(AssetSync.config.rackspace_username).to eq("xxxx")
     end
 
     it "should configure rackspace_api_key" do
-      AssetSync.config.rackspace_api_key.should == "zzzz"
+      expect(AssetSync.config.rackspace_api_key).to eq("zzzz")
     end
 
     it "should configure fog_directory" do
-      AssetSync.config.fog_directory.should == "rails_app_test"
+      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
     end
 
     it "should configure fog_region" do
-      AssetSync.config.fog_region.should == "eu-west-1"
+      expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
   end
 end

data/spec/unit/railsless_spec.rb

@@ -19,53 +19,53 @@ describe AssetSync do
     end
 
     it "should have prefix of assets" do
-      AssetSync.config.prefix.should == "assets"
+      expect(AssetSync.config.prefix).to eq("assets")
     end
 
     it "should have prefix of assets" do
-      AssetSync.config.public_path.to_s.should == "./public"
+      expect(AssetSync.config.public_path.to_s).to eq("./public")
     end
 
     it "should default AssetSync to enabled" do
-      AssetSync.config.enabled?.should be_true
-      AssetSync.enabled?.should be_true
+      expect(AssetSync.config.enabled?).to be_truthy
+      expect(AssetSync.enabled?).to be_truthy
     end
 
     it "should configure provider as AWS" do
-      AssetSync.config.fog_provider.should == 'AWS'
-      AssetSync.config.should be_aws
+      expect(AssetSync.config.fog_provider).to eq('AWS')
+      expect(AssetSync.config).to be_aws
     end
 
     it "should should keep existing remote files" do
-      AssetSync.config.existing_remote_files?.should == true
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
     it "should configure aws_access_key" do
-      AssetSync.config.aws_access_key_id.should == "aaaa"
+      expect(AssetSync.config.aws_access_key_id).to eq("aaaa")
     end
 
     it "should configure aws_secret_access_key" do
-      AssetSync.config.aws_secret_access_key.should == "bbbb"
+      expect(AssetSync.config.aws_secret_access_key).to eq("bbbb")
     end
 
     it "should configure aws_access_key" do
-      AssetSync.config.fog_directory.should == "mybucket"
+      expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
 
     it "should configure fog_region" do
-      AssetSync.config.fog_region.should == "eu-west-1"
+      expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default gzip_compression to false" do
-      AssetSync.config.gzip_compression.should be_false
+      expect(AssetSync.config.gzip_compression).to be_falsey
     end
 
     it "should default manifest to false" do
-      AssetSync.config.manifest.should be_false
+      expect(AssetSync.config.manifest).to be_falsey
     end
 
   end

data/spec/unit/storage_spec.rb

@@ -13,11 +13,11 @@ describe AssetSync::Storage do
     it 'should overwrite all remote files if set to ignore' do
       @config.existing_remote_files = 'ignore'
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      File.stub(:file?).and_return(true) # Pretend they all exist
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       @local_files.each do |file|
-        storage.should_receive(:upload_file).with(file)
+        expect(storage).to receive(:upload_file).with(file)
       end
       storage.upload_files
     end
@@ -26,12 +26,12 @@ describe AssetSync::Storage do
       @config.always_upload = ['local_image.jpg']
 
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      File.stub(:file?).and_return(true) # Pretend they all exist
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       (@local_files - @remote_files + storage.always_upload_files).each do |file|
-        storage.should_receive(:upload_file).with(file)
+        expect(storage).to receive(:upload_file).with(file)
       end
       storage.upload_files
     end
@@ -40,12 +40,12 @@ describe AssetSync::Storage do
       @config.ignored_files = ['local_image1.jpg', /local_stylesheet\d\.css/]
 
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      File.stub(:file?).and_return(true) # Pretend they all exist
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       (@local_files - @remote_files - storage.ignored_files + storage.always_upload_files).each do |file|
-        storage.should_receive(:upload_file).with(file)
+        expect(storage).to receive(:upload_file).with(file)
       end
       storage.upload_files
     end
@@ -68,16 +68,16 @@ describe AssetSync::Storage do
       ]
 
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      File.stub(:file?).and_return(true) # Pretend they all exist
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       updated_nonfingerprinted_files = [
         'public/image.png',
         'public/application.js',
       ]
       (@local_files - @remote_files + updated_nonfingerprinted_files).each do |file|
-        storage.should_receive(:upload_file).with(file)
+        expect(storage).to receive(:upload_file).with(file)
       end
       storage.upload_files
     end
@@ -88,19 +88,19 @@ describe AssetSync::Storage do
       local_files += ['dir1/dir2/file2.jpg', 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg']
       remote_files = []
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(local_files)
-      storage.stub(:get_remote_files).and_return(remote_files)
-      File.stub(:file?).and_return(true)
-      File.stub(:open).and_return(nil)
+      allow(storage).to receive(:local_files).and_return(local_files)
+      allow(storage).to receive(:get_remote_files).and_return(remote_files)
+      allow(File).to receive(:file?).and_return(true)
+      allow(File).to receive(:open).and_return(nil)
 
       def check_file(file)
         case file[:key]
         when 'file1.jpg'
         when 'dir1/dir2/file2.jpg'
-          !file.should_not include(:cache_control, :expires)
+          !expect(file).not_to include(:cache_control, :expires)
         when 'file1-1234567890abcdef1234567890abcdef.jpg'
         when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg'
-          file.should include(:cache_control, :expires)
+          expect(file).to include(:cache_control, :expires)
         else
           fail
         end
@@ -108,9 +108,9 @@ describe AssetSync::Storage do
 
       files = double()
       local_files.count.times do
-        files.should_receive(:create) { |file| check_file(file) }
+        expect(files).to receive(:create) { |file| check_file(file) }
       end
-      storage.stub_chain(:bucket, :files).and_return(files)
+      allow(storage).to receive_message_chain(:bucket, :files).and_return(files)
       storage.upload_files
     end
 
@@ -120,13 +120,13 @@ describe AssetSync::Storage do
       @config.fog_provider = 'AWS'
 
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      storage.stub(:upload_file).and_return(true)
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(storage).to receive(:upload_file).and_return(true)
 
-      mock_cdn = mock
-      Fog::CDN.should_receive(:new).and_return(mock_cdn)
-      mock_cdn.should_receive(:post_invalidation).with("1234", ["/assets/local_image1.jpg"]).and_return(stub({:body => {:id => '1234'}}))
+      mock_cdn = double
+      expect(Fog::CDN).to receive(:new).and_return(mock_cdn)
+      expect(mock_cdn).to receive(:post_invalidation).with("1234", ["/assets/local_image1.jpg"]).and_return(double({:body => {:id => '1234'}}))
 
       storage.upload_files
     end
@@ -136,7 +136,7 @@ describe AssetSync::Storage do
     before(:each) do
       # Object#remove_const does not remove the loaded
       # file from the $" variable
-      Object.send(:remove_const, :MIME) if defined?(MIME)
+      #Object.send(:remove_const, :MIME) if defined?(MIME)
       mime_types = $".grep(/mime\/types/).first
       $".delete(mime_types)
       require 'mime/types'
@@ -150,18 +150,18 @@ describe AssetSync::Storage do
         }
       }
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      File.stub(:open).and_return('file') # Pretend they all exist
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:open).and_return('file') # Pretend they all exist
 
       bucket = double
       files = double
 
-      storage.stub(:bucket).and_return(bucket)
-      bucket.stub(:files).and_return(files)
+      allow(storage).to receive(:bucket).and_return(bucket)
+      allow(bucket).to receive(:files).and_return(files)
 
-      files.should_receive(:create) do |argument|
-        argument[:cache_control].should == 'max-age=0'
+      expect(files).to receive(:create) do |argument|
+        expect(argument[:cache_control]).to eq('max-age=0')
       end
       storage.upload_file('assets/local_image2.jpg')
     end
@@ -173,22 +173,22 @@ describe AssetSync::Storage do
         }
       }
       storage = AssetSync::Storage.new(@config)
-      storage.stub(:local_files).and_return(@local_files)
-      storage.stub(:get_remote_files).and_return(@remote_files)
-      File.stub(:open).and_return('file') # Pretend they all exist
-      bucket = mock
-      files = mock
-      storage.stub(:bucket).and_return(bucket)
-      bucket.stub(:files).and_return(files)
-
-      files.should_receive(:create) do |argument|
-        argument[:cache_control].should == 'max-age=0'
+      allow(storage).to receive(:local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:open).and_return('file') # Pretend they all exist
+      bucket = double
+      files = double
+      allow(storage).to receive(:bucket).and_return(bucket)
+      allow(bucket).to receive(:files).and_return(files)
+
+      expect(files).to receive(:create) do |argument|
+        expect(argument[:cache_control]).to eq('max-age=0')
       end
       storage.upload_file('assets/some_longer_path/local_image2.jpg')
     end
 
     after(:each) do
-      Object.send(:remove_const, :MIME) if defined?(MIME)
+      #Object.send(:remove_const, :MIME) if defined?(MIME)
     end
   end
 end