diff --git a/spec/integration/file_bucket/file_spec.rb b/spec/integration/file_bucket/file_spec.rb index f0dbecaa3..7a4dd98b5 100644 --- a/spec/integration/file_bucket/file_spec.rb +++ b/spec/integration/file_bucket/file_spec.rb @@ -1,65 +1,54 @@ #! /usr/bin/env ruby require 'spec_helper' require 'puppet/file_bucket/file' describe Puppet::FileBucket::File do describe "#indirection" do before :each do # Never connect to the network, no matter what described_class.indirection.terminus(:rest).class.any_instance.stubs(:find) end describe "when running the master application" do before :each do Puppet::Application[:master].setup_terminuses end { "md5/d41d8cd98f00b204e9800998ecf8427e" => :file, "https://puppetmaster:8140/production/file_bucket_file/md5/d41d8cd98f00b204e9800998ecf8427e" => :file, }.each do |key, terminus| it "should use the #{terminus} terminus when requesting #{key.inspect}" do described_class.indirection.terminus(terminus).class.any_instance.expects(:find) described_class.indirection.find(key) end end end describe "when running another application" do { "md5/d41d8cd98f00b204e9800998ecf8427e" => :file, "https://puppetmaster:8140/production/file_bucket_file/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest, }.each do |key, terminus| it "should use the #{terminus} terminus when requesting #{key.inspect}" do described_class.indirection.terminus(terminus).class.any_instance.expects(:find) described_class.indirection.find(key) end end end end describe "saving binary files" do - describe "on Ruby 1.8.7", :if => RUBY_VERSION.match(/^1\.8/) do - let(:binary) { "\xD1\xF2\r\n\x81NuSc\x00" } + let(:binary) { "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT) } - it "does not error when the same contents are saved twice" do - bucket_file = Puppet::FileBucket::File.new(binary) - Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) - Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) - end - end - describe "on Ruby 1.9+", :if => RUBY_VERSION.match(/^1\.9|^2/) do - let(:binary) { "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT) } - - it "does not error when the same contents are saved twice" do - bucket_file = Puppet::FileBucket::File.new(binary) - Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) - Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) - end + it "does not error when the same contents are saved twice" do + bucket_file = Puppet::FileBucket::File.new(binary) + Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) + Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name) end end end