savon 2.5.1 → 2.6.0

data/spec/integration/email_example_spec.rb

@@ -25,7 +25,7 @@ describe "Email example" do
       pending "API limit exceeded"
     else
       # The expected result. We unfortunately don't have a license key for this service.
-      response_text.should == "Email Domain Not Found"
+      expect(response_text).to eq("Email Domain Not Found")
     end
   end
 

data/spec/integration/random_quote_spec.rb

@@ -15,8 +15,8 @@ describe 'rpc/encoded binding test' do
     rescue Savon::SOAPFault => e
       $stderr.puts e.to_hash.inspect
       f_c = e.to_hash[:fault][:faultstring]
-      f_c.should_not  == 'No such operation \'getQuoteRequest\''
-      f_c.should == 'soapenv:Server.userException'
+      expect(f_c).not_to  eq('No such operation \'getQuoteRequest\'')
+      expect(f_c).to eq('soapenv:Server.userException')
       pending e
     end
   end

data/spec/integration/stockquote_example_spec.rb

@@ -22,7 +22,7 @@ describe "Stockquote example" do
     nori_options = { :convert_tags_to => lambda { |tag| tag.snakecase.to_sym } }
     result = Nori.new(nori_options).parse(cdata)
 
-    result[:stock_quotes][:stock][:symbol].should == "AAPL"
+    expect(result[:stock_quotes][:stock][:symbol]).to eq("AAPL")
   end
 
 end

data/spec/integration/zipcode_example_spec.rb

@@ -36,7 +36,7 @@ describe "ZIP code example" do
     threads.each(&:kill)
     values = threads.map { |thr| thr[:value] }.compact
 
-    values.uniq.size.should == values.size
+    expect(values.uniq.size).to eq(values.size)
   end
 
 end

data/spec/savon/builder_spec.rb

@@ -83,4 +83,9 @@ describe Savon::Builder do
     end
   end
 
+  describe '#body_attributes' do
+    it 'should not be nil' do
+      expect(builder.body_attributes).to eq({})
+    end
+  end
 end

data/spec/savon/client_spec.rb

@@ -65,7 +65,7 @@ describe Savon::Client do
 
     fit "defaults :log to false" do
       client = Savon.client(:wsdl => Fixture.wsdl(:authentication))
-      expect(client.globals[:log]).to be_false
+      expect(client.globals[:log]).to be_falsey
     end
   end
 

data/spec/savon/core_ext/string_spec.rb

@@ -4,33 +4,33 @@ describe String do
 
   describe "snakecase" do
     it "lowercases one word CamelCase" do
-      "Merb".snakecase.should == "merb"
+      expect("Merb".snakecase).to eq("merb")
     end
 
     it "makes one underscore snakecase two word CamelCase" do
-      "MerbCore".snakecase.should == "merb_core"
+      expect("MerbCore".snakecase).to eq("merb_core")
     end
 
     it "handles CamelCase with more than 2 words" do
-      "SoYouWantContributeToMerbCore".snakecase.should == "so_you_want_contribute_to_merb_core"
+      expect("SoYouWantContributeToMerbCore".snakecase).to eq("so_you_want_contribute_to_merb_core")
     end
 
     it "handles CamelCase with more than 2 capital letter in a row" do
-      "CNN".snakecase.should == "cnn"
-      "CNNNews".snakecase.should == "cnn_news"
-      "HeadlineCNNNews".snakecase.should == "headline_cnn_news"
+      expect("CNN".snakecase).to eq("cnn")
+      expect("CNNNews".snakecase).to eq("cnn_news")
+      expect("HeadlineCNNNews".snakecase).to eq("headline_cnn_news")
     end
 
     it "does NOT change one word lowercase" do
-      "merb".snakecase.should == "merb"
+      expect("merb".snakecase).to eq("merb")
     end
 
     it "leaves snake_case as is" do
-      "merb_core".snakecase.should == "merb_core"
+      expect("merb_core".snakecase).to eq("merb_core")
     end
 
     it "converts period characters to underscores" do
-      "User.GetEmail".snakecase.should == "user_get_email"
+      expect("User.GetEmail".snakecase).to eq("user_get_email")
     end
   end
 

data/spec/savon/http_error_spec.rb

@@ -11,11 +11,11 @@ describe Savon::HTTPError do
   describe ".present?" do
     it "returns true if there was an HTTP error" do
       http = new_response(:code => 404, :body => "Not Found")
-      expect(Savon::HTTPError.present? http).to be_true
+      expect(Savon::HTTPError.present? http).to be_truthy
     end
 
     it "returns false unless there was an HTTP error" do
-      expect(Savon::HTTPError.present? new_response).to be_false
+      expect(Savon::HTTPError.present? new_response).to be_falsey
     end
   end
 

data/spec/savon/options_spec.rb

@@ -45,6 +45,35 @@ describe "Options" do
     end
   end
 
+  context "global: :no_message_tag" do
+    it "omits the 'message tag' encapsulation step" do
+      client = new_client(:endpoint => @server.url(:repeat), :no_message_tag => true,
+                          :wsdl => Fixture.wsdl(:no_message_tag))
+      msg = {'extLoginData' => {'Login' => 'test.user', 'Password' => 'secret', 'FacilityID' => 1,
+               'ThreePLKey' => '{XXXX-XXXX-XXXX-XXXX}', 'ThreePLID' => 1},
+             'Items' => ['Item' => {'SKU' => '001002003A', 'CustomerID' => 1,
+              'InventoryMethod' => 'FIFO', 'UPC' => '001002003A'}]}
+      response = client.call(:create_items, :message => msg)
+
+      expect(response.http.body.scan(/<tns:extLoginData>/).count).to eq(1)
+    end
+
+    it "includes the 'message tag' encapsulation step" do
+      # This test is probably just exposing a bug while the previous
+      # test is using a workaround fix.
+      # That is just a guess though. I don't really have to properly debug the WSDL parser.
+      client = new_client(:endpoint => @server.url(:repeat), :no_message_tag => false,
+                          :wsdl => Fixture.wsdl(:no_message_tag))
+      msg = {'extLoginData' => {'Login' => 'test.user', 'Password' => 'secret', 'FacilityID' => 1,
+               'ThreePLKey' => '{XXXX-XXXX-XXXX-XXXX}', 'ThreePLID' => 1},
+             'Items' => ['Item' => {'SKU' => '001002003A', 'CustomerID' => 1,
+              'InventoryMethod' => 'FIFO', 'UPC' => '001002003A'}]}
+      response = client.call(:create_items, :message => msg)
+
+      expect(response.http.body.scan(/<tns:extLoginData>/).count).to eq(2)
+    end
+  end
+
   context "global :namespaces" do
     it "adds additional namespaces to the SOAP envelope" do
       namespaces = { "xmlns:whatever" => "http://whatever.example.com" }
@@ -55,6 +84,24 @@ describe "Options" do
     end
   end
 
+  context 'global :follow_redirects' do
+    it 'sets whether or not request should follow redirects' do
+      client = new_client(:endpoint => @server.url, :follow_redirects => true)
+
+      HTTPI::Request.any_instance.expects(:follow_redirect=).with(true)
+
+      response = client.call(:authenticate)
+    end
+
+    it 'defaults to false' do
+      client = new_client(:endpoint => @server.url)
+
+      HTTPI::Request.any_instance.expects(:follow_redirect=).with(false)
+
+      response = client.call(:authenticate)
+    end
+  end
+
   context "global :proxy" do
     it "sets the proxy server to use" do
       proxy_url = "http://example.com"
@@ -457,80 +504,215 @@ describe "Options" do
     end
   end
 
-  context "global :wsse_auth" do
-    it "adds WSSE basic auth information to the request" do
-      client = new_client(:endpoint => @server.url(:repeat), :wsse_auth => ["luke", "secret"])
-      response = client.call(:authenticate)
+  context ":wsse_auth" do
+    let(:username) { "luke" }
+    let(:password) { "secret" }
+    let(:request) { response.http.body }
 
-      request = response.http.body
+    shared_examples "WSSE basic auth" do
+      it "adds WSSE basic auth information to the request" do
+        # the header and wsse security node
+        wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+        expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
+
+        # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
+        expect(request).to include("<wsse:UsernameToken")
+        expect(request).to include("wsu:Id=\"UsernameToken-1\"")
+        expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
+
+        # the username and password node with type attribute
+        expect(request).to include("<wsse:Username>#{username}</wsse:Username>")
+        password_text = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"
+        expect(request).to include("<wsse:Password Type=\"#{password_text}\">#{password}</wsse:Password>")
+      end
+    end
+
+    shared_examples "WSSE digest auth" do
+      it "adds WSSE digest auth information to the request" do
+        # the header and wsse security node
+        wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+        expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
+
+        # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
+        expect(request).to include("<wsse:UsernameToken")
+        expect(request).to include("wsu:Id=\"UsernameToken-1\"")
+        expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
+
+        # the username node
+        expect(request).to include("<wsse:Username>#{username}</wsse:Username>")
+
+        # the nonce node
+        expect(request).to match(/<wsse:Nonce.*>.+\n<\/wsse:Nonce>/)
 
-      # the header and wsse security node
-      wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
+        # the created node with a timestamp
+        expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)
 
-      # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
-      expect(request).to include("<wsse:UsernameToken")
-      expect(request).to include("wsu:Id=\"UsernameToken-1\"")
-      expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
+        # the password node contains the encrypted value
+        password_digest = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
+        expect(request).to match(/<wsse:Password Type=\"#{password_digest}\">.+<\/wsse:Password>/)
+        expect(request).to_not include(password)
+      end
+    end
 
-      # the username and password node with type attribute
-      expect(request).to include("<wsse:Username>luke</wsse:Username>")
-      password_text = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"
-      expect(request).to include("<wsse:Password Type=\"#{password_text}\">secret</wsse:Password>")
+    shared_examples "no WSSE auth" do
+      it "does not add WSSE auth to the request" do
+        expect(request).not_to include("<wsse:UsernameToken")
+      end
     end
 
-    it "adds WSSE digest auth information to the request" do
-      client = new_client(:endpoint => @server.url(:repeat), :wsse_auth => ["lea", "top-secret", :digest])
-      response = client.call(:authenticate)
+    describe "global" do
+      context "enabled" do
+        context "without digest" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_auth => [username, password]) }
+          let(:response) { client.call(:authenticate) }
+          include_examples "WSSE basic auth"
+        end
 
-      request = response.http.body
+        context "with digest" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_auth => [username, password, :digest]) }
+          let(:response) { client.call(:authenticate) }
+          include_examples "WSSE digest auth"
+        end
 
-      # the header and wsse security node
-      wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
+        context "local override" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_auth => ["luke", "secret"]) }
+
+          context "enabled" do
+            let(:username) { "lea" }
+            let(:password) { "top-secret" }
+
+            context "without digest" do
+              let(:response) { client.call(:authenticate) {|locals| locals.wsse_auth(username, password)} }
+              include_examples "WSSE basic auth"
+            end
+
+            context "with digest" do
+              let(:response) { client.call(:authenticate) {|locals| locals.wsse_auth(username, password, :digest)} }
+              include_examples "WSSE digest auth"
+            end
+          end
+
+          context "disabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_auth(false)} }
+            include_examples "no WSSE auth"
+          end
+
+          context "set to nil" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_auth(nil)} }
+            include_examples "WSSE basic auth"
+          end
+        end
 
-      # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
-      expect(request).to include("<wsse:UsernameToken")
-      expect(request).to include("wsu:Id=\"UsernameToken-1\"")
-      expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
+        context "global" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_auth => [username, password, :digest]) }
+          let(:response) { client.call(:authenticate) }
+          include_examples "WSSE digest auth"
+        end
+      end
 
-      # the username node
-      expect(request).to include("<wsse:Username>lea</wsse:Username>")
+      context "not enabled" do
+        let(:client) { new_client(:endpoint => @server.url(:repeat)) }
 
-      # the nonce node
-      expect(request).to match(/<wsse:Nonce.*>.+\n<\/wsse:Nonce>/)
+        describe "local" do
+          context "enabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_auth(username, password, :digest)} }
+            include_examples "WSSE digest auth"
+          end
 
-      # the created node with a timestamp
-      expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)
+          context "disabled" do
+            let(:response) { client.call(:authenticate) { |locals| locals.wsse_auth(false)} }
+            include_examples "no WSSE auth"
+          end
 
-      # the password node contains the encrypted value
-      password_digest = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
-      expect(request).to match(/<wsse:Password Type=\"#{password_digest}\">.+<\/wsse:Password>/)
-      expect(request).to_not include("top-secret")
+          context "set to nil" do
+            let(:response) { client.call(:authenticate) { |locals| locals.wsse_auth(nil)} }
+            include_examples "no WSSE auth"
+          end
+        end
+      end
     end
   end
 
-  context "global :wsse_timestamp" do
-    it "adds WSSE timestamp auth information to the request" do
-      client = new_client(:endpoint => @server.url(:repeat), :wsse_timestamp => true)
-      response = client.call(:authenticate)
+  context ":wsse_timestamp" do
+    let(:request) { response.http.body }
 
-      request = response.http.body
+    shared_examples "WSSE timestamp" do
+      it "adds WSSE timestamp auth information to the request" do
+        # the header and wsse security node
+        wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+        expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
 
-      # the header and wsse security node
-      wsse_namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      expect(request).to include("<env:Header><wsse:Security xmlns:wsse=\"#{wsse_namespace}\">")
+        # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
+        expect(request).to include("<wsu:Timestamp")
+        expect(request).to include("wsu:Id=\"Timestamp-1\"")
+        expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
 
-      # split up to prevent problems with unordered Hash attributes in 1.8 [dh, 2012-12-13]
-      expect(request).to include("<wsu:Timestamp")
-      expect(request).to include("wsu:Id=\"Timestamp-1\"")
-      expect(request).to include("xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"")
+        # the created node with a timestamp
+        expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)
 
-      # the created node with a timestamp
-      expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)
+        # the expires node with a timestamp
+        expect(request).to match(/<wsu:Expires>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Expires>/)
+      end
+    end
+
+    shared_examples "no WSSE timestamp" do
+      it "does not add WSSE timestamp to the request" do
+        expect(request).not_to include("<wsu:Timestamp")
+      end
+    end
+
+    describe "global" do
+      context "enabled" do
+        context "through block without arguments" do
+          let(:client) do
+            new_client(:endpoint => @server.url(:repeat)) do |globals|
+              globals.wsse_timestamp
+            end
+          end
+          let(:response) { client.call(:authenticate) }
+          include_examples "WSSE timestamp"
+        end
 
-      # the expires node with a timestamp
-      expect(request).to match(/<wsu:Expires>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Expires>/)
+        context "through initializer options" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_timestamp => true) }
+          let(:response) { client.call(:authenticate) }
+          include_examples "WSSE timestamp"
+        end
+
+        context "with local override" do
+          let(:client) { new_client(:endpoint => @server.url(:repeat), :wsse_timestamp => true) }
+          context "enabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp} }
+            include_examples "WSSE timestamp"
+          end
+          context "disabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp(false) } }
+            include_examples "no WSSE timestamp"
+          end
+          context "set to nil" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp(nil) } }
+            include_examples "WSSE timestamp"
+          end
+        end
+      end
+
+      context "not enabled" do
+        let(:client) { new_client(:endpoint => @server.url(:repeat)) }
+        describe "local" do
+          context "enabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp} }
+            include_examples "WSSE timestamp"
+          end
+          context "disabled" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp(false) } }
+            include_examples "no WSSE timestamp"
+          end
+          context "set to nil" do
+            let(:response) { client.call(:authenticate) {|locals| locals.wsse_timestamp(nil) } }
+            include_examples "no WSSE timestamp"
+          end
+        end
+      end
     end
   end
 

data/spec/savon/request_spec.rb

@@ -129,7 +129,7 @@ describe Savon::WSDLRequest do
 
           new_wsdl_request.build
 
-          expect { http_request.auth.ssl.cert_key }.to raise_error(OpenSSL::PKey::RSAError)
+          expect { http_request.auth.ssl.cert_key }.to raise_error
         end
       end
 
@@ -145,7 +145,7 @@ describe Savon::WSDLRequest do
 
           new_wsdl_request.build
 
-          http_request.auth.ssl.cert_key.to_s.should =~ /BEGIN RSA PRIVATE KEY/
+          expect(http_request.auth.ssl.cert_key.to_s).to match(/BEGIN RSA PRIVATE KEY/)
         end
       end
     end