koala 1.8.0 → 1.9.0

data/spec/cases/legacy_spec.rb

@@ -5,27 +5,27 @@ describe "legacy APIs" do
 
   it "deprecates the REST API" do
     api = Koala::Facebook::API.new
-    api.stub(:api)
-    Koala::Utils.should_receive(:deprecate)
+    allow(api).to receive(:api)
+    expect(Koala::Utils).to receive(:deprecate)
     api.rest_call("stuff")
   end
 
   describe Koala::Facebook::GraphAPI do
     describe "class consolidation" do
       before :each do
-        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
       end
 
       it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::GraphAPI)
+        api = expect(Koala::Facebook::GraphAPI.new("token")).to be_a(Koala::Facebook::GraphAPI)
       end
 
       it "ultimately creates an API object" do
-        api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::API)
+        api = expect(Koala::Facebook::GraphAPI.new("token")).to be_a(Koala::Facebook::API)
       end
 
       it "fires a depreciation warning" do
-        Koala::Utils.should_receive(:deprecate)
+        expect(Koala::Utils).to receive(:deprecate)
         api = Koala::Facebook::GraphAPI.new("token")
       end
     end
@@ -34,19 +34,19 @@ describe "legacy APIs" do
   describe Koala::Facebook::RestAPI do
     describe "class consolidation" do
       before :each do
-        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
       end
 
       it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = Koala::Facebook::RestAPI.new("token").should be_a(Koala::Facebook::RestAPI)
+        api = expect(Koala::Facebook::RestAPI.new("token")).to be_a(Koala::Facebook::RestAPI)
       end
 
       it "ultimately creates an API object" do
-        api = Koala::Facebook::RestAPI.new("token").should be_a(Koala::Facebook::API)
+        api = expect(Koala::Facebook::RestAPI.new("token")).to be_a(Koala::Facebook::API)
       end
 
       it "fires a depreciation warning" do
-        Koala::Utils.should_receive(:deprecate)
+        expect(Koala::Utils).to receive(:deprecate)
         api = Koala::Facebook::RestAPI.new("token")
       end
     end
@@ -55,19 +55,19 @@ describe "legacy APIs" do
   describe Koala::Facebook::GraphAndRestAPI do
     describe "class consolidation" do
       before :each do
-        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
       end
 
       it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = Koala::Facebook::GraphAndRestAPI.new("token").should be_a(Koala::Facebook::GraphAndRestAPI)
+        api = expect(Koala::Facebook::GraphAndRestAPI.new("token")).to be_a(Koala::Facebook::GraphAndRestAPI)
       end
 
       it "ultimately creates an API object" do
-        api = Koala::Facebook::GraphAndRestAPI.new("token").should be_a(Koala::Facebook::API)
+        api = expect(Koala::Facebook::GraphAndRestAPI.new("token")).to be_a(Koala::Facebook::API)
       end
 
       it "fires a depreciation warning" do
-        Koala::Utils.should_receive(:deprecate)
+        expect(Koala::Utils).to receive(:deprecate)
         api = Koala::Facebook::GraphAndRestAPI.new("token")
       end
     end
@@ -76,40 +76,40 @@ describe "legacy APIs" do
   {:typhoeus => Koala::TyphoeusService, :net_http => Koala::NetHTTPService}.each_pair do |adapter, module_class|
     describe module_class.to_s do
       it "responds to deprecated_interface" do
-        module_class.should respond_to(:deprecated_interface)
+        expect(module_class).to respond_to(:deprecated_interface)
       end
 
       it "issues a deprecation warning" do
-        Koala::Utils.should_receive(:deprecate)
+        expect(Koala::Utils).to receive(:deprecate)
         module_class.deprecated_interface
       end
 
       it "sets the default adapter to #{adapter}" do
         module_class.deprecated_interface
-        Faraday.default_adapter.should == adapter
+        expect(Faraday.default_adapter).to eq(adapter)
       end
     end
   end
 
   describe "moved classes" do
     it "allows you to access Koala::HTTPService::MultipartRequest through the Koala module" do
-      Koala::MultipartRequest.should == Koala::HTTPService::MultipartRequest
+      expect(Koala::MultipartRequest).to eq(Koala::HTTPService::MultipartRequest)
     end
     
     it "allows you to access Koala::Response through the Koala module" do
-      Koala::Response.should == Koala::HTTPService::Response
+      expect(Koala::Response).to eq(Koala::HTTPService::Response)
     end
     
     it "allows you to access Koala::Response through the Koala module" do
-      Koala::UploadableIO.should == Koala::HTTPService::UploadableIO
+      expect(Koala::UploadableIO).to eq(Koala::HTTPService::UploadableIO)
     end
     
     it "allows you to access Koala::Facebook::GraphBatchAPI::BatchOperation through the Koala::Facebook module" do
-      Koala::Facebook::BatchOperation.should == Koala::Facebook::GraphBatchAPI::BatchOperation
+      expect(Koala::Facebook::BatchOperation).to eq(Koala::Facebook::GraphBatchAPI::BatchOperation)
     end 
     
     it "allows you to access Koala::Facebook::API::GraphCollection through the Koala::Facebook module" do
-      Koala::Facebook::GraphCollection.should == Koala::Facebook::API::GraphCollection
+      expect(Koala::Facebook::GraphCollection).to eq(Koala::Facebook::API::GraphCollection)
     end   
   end
 end

data/spec/cases/multipart_request_spec.rb

@@ -2,65 +2,64 @@ require 'spec_helper'
 
 describe Koala::HTTPService::MultipartRequest do
   it "is a subclass of Faraday::Request::Multipart" do
-    Koala::HTTPService::MultipartRequest.superclass.should == Faraday::Request::Multipart
+    expect(Koala::HTTPService::MultipartRequest.superclass).to eq(Faraday::Request::Multipart)
   end
-  
+
   it "defines mime_type as multipart/form-data" do
-    Koala::HTTPService::MultipartRequest.mime_type.should == 'multipart/form-data'
+    expect(Koala::HTTPService::MultipartRequest.mime_type).to eq('multipart/form-data')
   end
-  
+
   describe "#process_request?" do
     before :each do
-      @env = {}
+      @env = Faraday::Env.new
       @multipart = Koala::HTTPService::MultipartRequest.new
-      @multipart.stub(:request_type).and_return("")
+      allow(@multipart).to receive(:request_type).and_return("")
     end
-    
+
     # no way to test the call to super, unfortunately
     it "returns true if env[:body] is a hash with at least one hash in its values" do
       @env[:body] = {:a => {:c => 2}}
-      @multipart.process_request?(@env).should be_true
+      expect(@multipart.process_request?(@env)).to be_truthy
     end
 
     it "returns true if env[:body] is a hash with at least one array in its values" do
       @env[:body] = {:a => [:c, 2]}
-      @multipart.process_request?(@env).should be_true
+      expect(@multipart.process_request?(@env)).to be_truthy
     end
 
     it "returns true if env[:body] is a hash with mixed objects in its values" do
       @env[:body] = {:a => [:c, 2], :b => {:e => :f}}
-      @multipart.process_request?(@env).should be_true
+      expect(@multipart.process_request?(@env)).to be_truthy
     end
 
     it "returns false if env[:body] is a string" do
       @env[:body] = "my body"
-      @multipart.process_request?(@env).should be_false
+      expect(@multipart.process_request?(@env)).to be_falsey
     end
 
     it "returns false if env[:body] is a hash without an array or hash value" do
       @env[:body] = {:a => 3}
-      @multipart.process_request?(@env).should be_false
-    end    
+      expect(@multipart.process_request?(@env)).to be_falsey
+    end
   end
-  
+
   describe "#process_params" do
     before :each do
       @parent = Faraday::Request::Multipart.new
-      @multipart = Koala::HTTPService::MultipartRequest.new 
-      @block = lambda {|k, v| "#{k}=#{v}"}     
+      @multipart = Koala::HTTPService::MultipartRequest.new
+      @block = lambda {|k, v| "#{k}=#{v}"}
     end
-    
+
     it "is identical to the parent for requests without a prefix" do
       hash = {:a => 2, :c => "3"}
-      @multipart.process_params(hash, &@block).should == @parent.process_params(hash, &@block)
+      expect(@multipart.process_params(hash, &@block)).to eq(@parent.process_params(hash, &@block))
     end
-    
+
     it "replaces encodes [ and ] if the request has a prefix" do
       hash = {:a => 2, :c => "3"}
       prefix = "foo"
       # process_params returns an array
-      @multipart.process_params(hash, prefix, &@block).join("&").should == @parent.process_params(hash, prefix, &@block).join("&").gsub(/\[/, "%5B").gsub(/\]/, "%5D")
+      expect(@multipart.process_params(hash, prefix, &@block).join("&")).to eq(@parent.process_params(hash, prefix, &@block).join("&").gsub(/\[/, "%5B").gsub(/\]/, "%5D"))
     end
   end
-  
 end