signet 0.5.1 → 0.6.0

data/spec/signet/oauth_1/services/google_spec.rb

@@ -45,9 +45,9 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
   end
 
   it 'should raise an error if scope is omitted' do
-    (lambda do
+    expect(lambda do
       @client.fetch_temporary_credential!
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
   end
 
   it 'should raise an error if the server gives an unexpected status' do
@@ -56,7 +56,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
         [509, {}, 'Rate limit hit or something.']
       end
     end
-    (lambda do
+    expect(lambda do
       connection = Faraday.new(:url => 'https://www.google.com') do |builder|
         builder.adapter(:test, stubs)
       end
@@ -66,7 +66,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
           :scope => 'https://www.google.com/m8/feeds/'
         }
       )
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
     stubs.verify_stubbed_calls
   end
 
@@ -74,35 +74,35 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
     @client.fetch_temporary_credential!(:additional_parameters => {
       :scope => 'https://www.google.com/m8/feeds/'
     })
-    @client.temporary_credential_key.size.should > 0
-    @client.temporary_credential_secret.size.should > 0
+    expect(@client.temporary_credential_key.size).to be > 0
+    expect(@client.temporary_credential_secret.size).to be > 0
   end
 
   it 'should have the correct authorization URI' do
     @client.fetch_temporary_credential!(:additional_parameters => {
       :scope => 'https://www.google.com/m8/feeds/'
     })
-    @client.authorization_uri.query_values["oauth_token"].should ==
-      @client.temporary_credential_key
+    expect(@client.authorization_uri.query_values["oauth_token"]).to eq(
+      @client.temporary_credential_key)
   end
 
   it 'should raise an error if the temporary credentials are bogus' do
-    (lambda do
+    expect(lambda do
       @client.temporary_credential_key = '12345'
       @client.temporary_credential_secret = '12345'
       @client.fetch_token_credential!(:verifier => 'XbVKagBShNsAGBRJWoC4gtFR')
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
   end
 
   it 'should raise an error if the token credentials are bogus' do
-    (lambda do
+    expect(lambda do
       @client.token_credential_key = '12345'
       @client.token_credential_secret = '12345'
       @client.fetch_protected_resource(
         :uri =>
           'https://www.google.com/m8/feeds/'
       )
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
   end
 
   # We have to stub responses for the token credentials
@@ -130,9 +130,8 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
         :scope => 'https://www.google.com/m8/feeds/'
       }
     )
-    @client.token_credential_key.should ==
-      '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
-    @client.token_credential_secret.should == 'Ew3YHAY4bcBryiOUvbdHGa57'
+    expect(@client.token_credential_key).to eq '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
+    expect(@client.token_credential_secret).to eq 'Ew3YHAY4bcBryiOUvbdHGa57'
     stubs.verify_stubbed_calls
   end
 
@@ -142,7 +141,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
         [509, {}, 'Rate limit hit or something.']
       end
     end
-    (lambda do
+    expect(lambda do
       connection = Faraday.new(:url => 'https://www.google.com') do |builder|
         builder.adapter(:test, stubs)
       end
@@ -155,7 +154,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
           :scope => 'https://www.google.com/m8/feeds/'
         }
       )
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
     stubs.verify_stubbed_calls
   end
 
@@ -182,9 +181,9 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
       :uri =>
         'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
     )
-    response.status.should == 200
-    response.headers['Content-Type'].should == 'application/json'
-    response.body.should == '{"data":"goes here"}'
+    expect(response.status).to eq 200
+    expect(response.headers['Content-Type']).to eq 'application/json'
+    expect(response.body).to eq '{"data":"goes here"}'
   end
 
   it 'should correctly fetch the protected resource' do
@@ -213,9 +212,9 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
         )
       end
     )
-    response.status.should == 200
-    response.headers['Content-Type'].should == 'application/json'
-    response.body.should == '{"data":"goes here"}'
+    expect(response.status).to eq 200
+    expect(response.headers['Content-Type']).to eq 'application/json'
+    expect(response.body).to eq '{"data":"goes here"}'
   end
 end
 
@@ -229,11 +228,11 @@ describe Signet::OAuth1::Client, 'configured for two-legged OAuth' do
   end
 
   it 'should raise an error if the client credentials are bogus' do
-    (lambda do
+    expect(lambda do
       @client.fetch_protected_resource(
         :uri =>
           'https://www.google.com/m8/feeds/'
       )
-    end).should raise_error(Signet::AuthorizationError)
+    end).to raise_error(Signet::AuthorizationError)
   end
 end

data/spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb

@@ -38,9 +38,9 @@ describe Signet::OAuth1::HMACSHA1 do
     client_credential_secret = "kd94hf93k423kf44"
     token_credential_secret = "pfkkdhi9sl3r4s00"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
-    Signet::OAuth1::HMACSHA1.generate_signature(
+    expect(Signet::OAuth1::HMACSHA1.generate_signature(
       base_string, client_credential_secret, token_credential_secret
-    ).should == "tR3+Ty81lMeYAr/Fid0kMTYa/WM="
+    )).to eq "tR3+Ty81lMeYAr/Fid0kMTYa/WM="
   end
 
   it 'should correctly generate a signature' do
@@ -59,8 +59,8 @@ describe Signet::OAuth1::HMACSHA1 do
     client_credential_secret = "Kv+o2XXL/9RxkQW3lO3QTVlH"
     token_credential_secret = "QllSuL9eQ5FXFO1Z/HcgL4ON"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
-    Signet::OAuth1::HMACSHA1.generate_signature(
+    expect(Signet::OAuth1::HMACSHA1.generate_signature(
       base_string, client_credential_secret, token_credential_secret
-    ).should == "G/nkdbmbpEA+6RD1Sc5uIefhFfQ="
+    )).to eq "G/nkdbmbpEA+6RD1Sc5uIefhFfQ="
   end
 end

data/spec/signet/oauth_1/signature_methods/plaintext_spec.rb

@@ -38,9 +38,9 @@ describe Signet::OAuth1::PLAINTEXT do
     client_credential_secret = "kd94hf93k423kf44"
     token_credential_secret = "pfkkdhi9sl3r4s00"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
-    Signet::OAuth1::PLAINTEXT.generate_signature(
+    expect(Signet::OAuth1::PLAINTEXT.generate_signature(
         base_string, client_credential_secret, token_credential_secret
-    ).should == "kd94hf93k423kf44%26pfkkdhi9sl3r4s00"
+    )).to eq "kd94hf93k423kf44%26pfkkdhi9sl3r4s00"
   end
 
   it 'should correctly generate a signature' do
@@ -59,8 +59,8 @@ describe Signet::OAuth1::PLAINTEXT do
     client_credential_secret = "Kv+o2XXL/9RxkQW3lO3QTVlH"
     token_credential_secret = "QllSuL9eQ5FXFO1Z/HcgL4ON"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
-    Signet::OAuth1::PLAINTEXT.generate_signature(
+    expect(Signet::OAuth1::PLAINTEXT.generate_signature(
         base_string, client_credential_secret, token_credential_secret
-    ).should == "Kv%252Bo2XXL%252F9RxkQW3lO3QTVlH%26QllSuL9eQ5FXFO1Z%252FHcgL4ON"
+    )).to eq "Kv%252Bo2XXL%252F9RxkQW3lO3QTVlH%26QllSuL9eQ5FXFO1Z%252FHcgL4ON"
   end
 end

data/spec/signet/oauth_1/signature_methods/rsa_sha1_spec.rb

@@ -51,9 +51,9 @@ Lw03eHTNQghS0A==
     token_credential_secret = "pfkkdhi9sl3r4s00"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
 
-    Signet::OAuth1::RSASHA1.generate_signature(
+    expect(Signet::OAuth1::RSASHA1.generate_signature(
         base_string, client_credential_secret, token_credential_secret
-    ).should == "P72T4RS8dVBneQPJSY71D3iLEjge2tiivxEasPVoaoDldDgPdwpQfhS1q0th19jB3B3+9P6tBWjpWaVPxrNZe3ssBCiwS/EmXZ/6VCJGU3YoDHMtz+0jCd36NjHj5I6TpLVQ8/rtfy6+EzpdUMz7ydnhKXYqJFPOWnNv8HM1W7I="
+    )).to eq "P72T4RS8dVBneQPJSY71D3iLEjge2tiivxEasPVoaoDldDgPdwpQfhS1q0th19jB3B3+9P6tBWjpWaVPxrNZe3ssBCiwS/EmXZ/6VCJGU3YoDHMtz+0jCd36NjHj5I6TpLVQ8/rtfy6+EzpdUMz7ydnhKXYqJFPOWnNv8HM1W7I="
   end
 end
 
@@ -89,9 +89,9 @@ Lw03eHTNQghS0A==
     token_credential_secret = "pfkkdhi9sl3r4s00"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
 
-    Signet::OAuth1::RSASHA1.generate_signature(
+    expect(Signet::OAuth1::RSASHA1.generate_signature(
         base_string, client_credential_secret, token_credential_secret
-    ).should == "jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE="
+    )).to eq "jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE="
   end
 
 
@@ -124,9 +124,9 @@ Lw03eHTNQghS0A==
 -----END PRIVATE KEY-----"
     token_credential_secret = "QllSuL9eQ5FXFO1Z/HcgL4ON"
     base_string = Signet::OAuth1.generate_base_string(method, uri, parameters)
-    Signet::OAuth1::RSASHA1.generate_signature(
+    expect(Signet::OAuth1::RSASHA1.generate_signature(
         base_string, client_credential_secret, token_credential_secret
-    ).should == "Q1O7Ovi0jdacl/OTJoH3MAyOO/9H/tTXmoJzP/YqiKEJ+/wfShXo1RXX0xmlcjDR1XYxB1RMgHkFWQYYwz1qGCUhkXlH1c/to2qxPksptfPHRe7PJTxRClrdqLFOlhN7w2kO7tHVCeEp8IJIKON9q7cdXroTP7ctPPS+Q883SS0="
+    )).to eq "Q1O7Ovi0jdacl/OTJoH3MAyOO/9H/tTXmoJzP/YqiKEJ+/wfShXo1RXX0xmlcjDR1XYxB1RMgHkFWQYYwz1qGCUhkXlH1c/to2qxPksptfPHRe7PJTxRClrdqLFOlhN7w2kO7tHVCeEp8IJIKON9q7cdXroTP7ctPPS+Q883SS0="
   end
 
 end