uploadable_io_spec.rb in koala-1.9.0rc1

- old
+ new

@@ -14,11 +14,11 @@
     uploaded_file = double('ActionDispatch::Http::UploadedFile',
       :content_type => true,
       :tempfile => tempfile,
       :original_filename => "bar"
     )
-    tempfile.stub(:respond_to?).with(:path).and_return(true)
+    allow(tempfile).to receive(:respond_to?).with(:path).and_return(true)
 
     [tempfile, uploaded_file]
   end
 
   def sinatra_mocks
@@ -37,19 +37,19 @@
           @stub_type = double("image/jpg")
           @koala_io_params.concat([@stub_type])
         end
 
         it "returns an UploadIO with the same file path" do
-          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @path
+          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@path)
         end
 
         it "returns an UploadIO with the same content type" do
-          Koala::UploadableIO.new(*@koala_io_params).content_type.should == @stub_type
+          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(@stub_type)
         end
 
         it "returns an UploadIO with the file's name" do
-          Koala::UploadableIO.new(*@koala_io_params).filename.should == File.basename(@path)
+          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@path))
         end
       end
 
       describe "and no content type" do
         it_should_behave_like "determining a mime type"
@@ -66,20 +66,20 @@
         before :each do
           @koala_io_params.concat(["image/jpg"])
         end
 
         it "returns an UploadIO with the same io" do
-          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @koala_io_params[0]
+          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          Koala::UploadableIO.new(*@koala_io_params).content_type.should == content_stub
+          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          Koala::UploadableIO.new(*@koala_io_params).filename.should == File.basename(@file.path)
+          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
       describe "and no content type" do
         it_should_behave_like "determining a mime type"
@@ -98,20 +98,20 @@
           @koala_io_params.concat(["image/jpg"])
         end
 
         it "returns an UploadIO with the same io" do
           #Problem comparing Tempfile in Ruby 1.8, REE and Rubinius mode 1.8
-          Koala::UploadableIO.new(*@koala_io_params).io_or_path.path.should == @koala_io_params[0].path
+          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path.path).to eq(@koala_io_params[0].path)
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          Koala::UploadableIO.new(*@koala_io_params).content_type.should == content_stub
+          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          Koala::UploadableIO.new(*@koala_io_params).filename.should == File.basename(@file.path)
+          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
       describe "and no content type" do
         it_should_behave_like "determining a mime type"
@@ -128,22 +128,22 @@
         before :each do
           @koala_io_params.concat(["image/jpg"])
         end
 
         it "returns an UploadableIO with the same io" do
-          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @koala_io_params[0]
+          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          Koala::UploadableIO.new(*@koala_io_params).content_type.should == content_stub
+          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
       end
 
       describe "and no content type" do
         it "raises an exception" do
-          lambda { Koala::UploadableIO.new(*@koala_io_params) }.should raise_exception(Koala::KoalaError)
+          expect { Koala::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
         end
       end
     end
 
     describe "when given a Rails 3 ActionDispatch::Http::UploadedFile" do
@@ -151,22 +151,22 @@
         @tempfile, @uploaded_file = rails_3_mocks
       end
 
       it "gets the path from the tempfile associated with the UploadedFile" do
         expected_path = double('Tempfile')
-        @tempfile.should_receive(:path).and_return(expected_path)
-        Koala::UploadableIO.new(@uploaded_file).io_or_path.should == expected_path
+        expect(@tempfile).to receive(:path).and_return(expected_path)
+        expect(Koala::UploadableIO.new(@uploaded_file).io_or_path).to eq(expected_path)
       end
 
       it "gets the content type via the content_type method" do
         expected_content_type = double('Content Type')
-        @uploaded_file.should_receive(:content_type).and_return(expected_content_type)
-        Koala::UploadableIO.new(@uploaded_file).content_type.should == expected_content_type
+        expect(@uploaded_file).to receive(:content_type).and_return(expected_content_type)
+        expect(Koala::UploadableIO.new(@uploaded_file).content_type).to eq(expected_content_type)
       end
 
       it "gets the filename from the UploadedFile" do
-        Koala::UploadableIO.new(@uploaded_file).filename.should == @uploaded_file.original_filename
+        expect(Koala::UploadableIO.new(@uploaded_file).filename).to eq(@uploaded_file.original_filename)
       end
     end
 
     describe "when given a Sinatra file parameter hash" do
       before(:each) do
@@ -176,91 +176,91 @@
       it "gets the io_or_path from the :tempfile key" do
         expected_file = double('File')
         @file_hash[:tempfile] = expected_file
 
         uploadable = Koala::UploadableIO.new(@file_hash)
-        uploadable.io_or_path.should == expected_file
+        expect(uploadable.io_or_path).to eq(expected_file)
       end
 
       it "gets the content type from the :type key" do
         expected_content_type = double('Content Type')
         @file_hash[:type] = expected_content_type
 
         uploadable = Koala::UploadableIO.new(@file_hash)
-        uploadable.content_type.should == expected_content_type
+        expect(uploadable.content_type).to eq(expected_content_type)
       end
 
       it "gets the content type from the :type key" do
         uploadable = Koala::UploadableIO.new(@file_hash)
-        uploadable.filename.should == @file_hash[:filename]
+        expect(uploadable.filename).to eq(@file_hash[:filename])
       end
     end
 
     describe "for files with with recognizable MIME types" do
       # what that means is tested below
       it "should accept a file object alone" do
         params = [BEACH_BALL_PATH]
-        lambda { Koala::UploadableIO.new(*params) }.should_not raise_exception
+        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
       end
 
       it "should accept a file path alone" do
         params = [BEACH_BALL_PATH]
-        lambda { Koala::UploadableIO.new(*params) }.should_not raise_exception
+        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
       end
     end
   end
 
   describe "getting an UploadableIO" do
     before(:each) do
       @upload_io = double("UploadIO")
-      UploadIO.stub(:new).with(anything, anything, anything).and_return(@upload_io)
+      allow(UploadIO).to receive(:new).with(anything, anything, anything).and_return(@upload_io)
     end
 
     context "if no filename was provided" do
       it "should call the constructor with the content type, file name, and a dummy file name" do
-        UploadIO.should_receive(:new).with(BEACH_BALL_PATH, "content/type", anything).and_return(@upload_io)
-        Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io.should == @upload_io
+        expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", anything).and_return(@upload_io)
+        expect(Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io).to eq(@upload_io)
       end
     end
 
     context "if a filename was provided" do
       it "should call the constructor with the content type, file name, and the filename" do
         filename = "file"
-        UploadIO.should_receive(:new).with(BEACH_BALL_PATH, "content/type", filename).and_return(@upload_io)
+        expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", filename).and_return(@upload_io)
         Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type", filename).to_upload_io
       end
     end
   end
 
   describe "getting a file" do
     it "returns the File if initialized with a file" do
       f = File.new(BEACH_BALL_PATH)
-      Koala::UploadableIO.new(f).to_file.should == f
+      expect(Koala::UploadableIO.new(f).to_file).to eq(f)
     end
 
     it "should open up and return a file corresponding to the path if io_or_path is a path" do
       result = double("File")
-      File.should_receive(:open).with(BEACH_BALL_PATH).and_return(result)
-      Koala::UploadableIO.new(BEACH_BALL_PATH).to_file.should == result
+      expect(File).to receive(:open).with(BEACH_BALL_PATH).and_return(result)
+      expect(Koala::UploadableIO.new(BEACH_BALL_PATH).to_file).to eq(result)
     end
   end
 
   describe ".binary_content?" do
     it "returns true for Rails 3 file uploads" do
-      Koala::UploadableIO.binary_content?(rails_3_mocks.last).should be_true
+      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for Sinatra file uploads" do
-      Koala::UploadableIO.binary_content?(rails_3_mocks.last).should be_true
+      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for File objects" do
-      Koala::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH)).should be_true
+      expect(Koala::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH))).to be_truthy
     end
 
     it "returns false for everything else" do
-      Koala::UploadableIO.binary_content?(StringIO.new).should be_false
-      Koala::UploadableIO.binary_content?(BEACH_BALL_PATH).should be_false
-      Koala::UploadableIO.binary_content?(nil).should be_false
+      expect(Koala::UploadableIO.binary_content?(StringIO.new)).to be_falsey
+      expect(Koala::UploadableIO.binary_content?(BEACH_BALL_PATH)).to be_falsey
+      expect(Koala::UploadableIO.binary_content?(nil)).to be_falsey
     end
   end
 end  # describe UploadableIO