wasabi 3.2.3 → 3.6.0

data/spec/wasabi/document/multiple_namespaces_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,30 +7,50 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:multiple_namespaces).read }
 
-    its(:namespace) { should == "http://example.com/actions" }
+    describe '#namespace' do
+      subject { super().namespace }
+      it { is_expected.to eq "http://example.com/actions" }
+    end
 
-    its(:endpoint) { should == URI("http://example.com:1234/soap") }
+    describe '#endpoint' do
+      subject { super().endpoint }
+      it { is_expected.to eq URI("http://example.com:1234/soap") }
+    end
 
-    its(:element_form_default) { should == :qualified }
+    describe '#element_form_default' do
+      subject { super().element_form_default }
+      it { is_expected.to eq :qualified }
+    end
 
-    it { should have(1).operations }
+    it 'has 1 operation' do
+      expect(subject.operations.size).to eq(1)
+    end
 
-    its(:operations) do
-      should == { :save => { :input => "Save", :output=>"SaveResponse", :action => "http://example.com/actions.Save", :namespace_identifier => "actions", :parameters => { :article => { :name => "article", :type => "Article" } } } }
+    describe '#operations' do
+      subject { super().operations }
+      it do
+        is_expected.to match({ :save => { :input => "Save", :output=>"SaveResponse", :action => "http://example.com/actions.Save", :namespace_identifier => "actions", :parameters => { :article => { :name => "article", :type => "Article" } } } })
+      end
     end
 
-    its(:type_namespaces) do
-      should =~ [
-        [["Save"], "http://example.com/actions"],
-        [["Save", "article"], "http://example.com/actions"],
-        [["Article"], "http://example.com/article"],
-        [["Article", "Author"], "http://example.com/article"],
-        [["Article", "Title"], "http://example.com/article"]
-      ]
+    describe '#type_namespaces' do
+      subject { super().type_namespaces }
+      it do
+        is_expected.to match([
+          [["Save"], "http://example.com/actions"],
+          [["Save", "article"], "http://example.com/actions"],
+          [["Article"], "http://example.com/article"],
+          [["Article", "Author"], "http://example.com/article"],
+          [["Article", "Title"], "http://example.com/article"]
+        ])
+      end
     end
 
-    its(:type_definitions) do
-      should =~ [ [["Save", "article"], "Article"] ]
+    describe '#type_definitions' do
+      subject { super().type_definitions }
+      it do
+        is_expected.to match([ [["Save", "article"], "Article"] ])
+      end
     end
 
   end

data/spec/wasabi/document/namespaced_actions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,21 +7,35 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:namespaced_actions).read }
 
-    its(:namespace) { should == "http://api.example.com/api/" }
+    describe '#namespace' do
+      subject { super().namespace }
+      it { should == "http://api.example.com/api/" }
+    end
 
-    its(:endpoint) { should == URI("https://api.example.com/api/api.asmx") }
+    describe '#endpoint' do
+      subject { super().endpoint }
+      it { should == URI("https://api.example.com/api/api.asmx") }
+    end
 
-    its(:element_form_default) { should == :qualified }
+    describe '#element_form_default' do
+      subject { super().element_form_default }
+      it { should == :qualified }
+    end
 
-    it { should have(3).operations }
+    it 'has 3 operations' do
+      expect(subject.operations.size).to eq(3)
+    end
 
-    its(:operations) do
+    describe '#operations' do
+      subject { super().operations }
+      it do
       should include(
         { :delete_client => { :input => "Client.Delete", :output => "Client.DeleteResponse", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
         { :get_clients   => { :input => "User.GetClients", :output => "User.GetClientsResponse", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
         { :get_api_key   => { :input => "User.GetApiKey", :output => "User.GetApiKeyResponse", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
       )
     end
+    end
 
   end
 end

data/spec/wasabi/document/no_namespace_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,21 +7,35 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:no_namespace).read }
 
-    its(:namespace) { should == "urn:ActionWebService" }
+    describe '#namespace' do
+      subject { super().namespace }
+      it { should == "urn:ActionWebService" }
+    end
 
-    its(:endpoint) { should == URI("http://example.com/api/api") }
+    describe '#endpoint' do
+      subject { super().endpoint }
+      it { should == URI("http://example.com/api/api") }
+    end
 
-    its(:element_form_default) { should == :unqualified }
+    describe '#element_form_default' do
+      subject { super().element_form_default }
+      it { should == :unqualified }
+    end
 
-    it { should have(3).operations }
+    it 'has 3 operations' do
+      expect(subject.operations.size).to eq(3)
+    end
 
-    its(:operations) do
+    describe '#operations' do
+      subject { super().operations }
+      it do
       should include(
-        { :get_user_login_by_id => { :input => "GetUserLoginById", :output => "GetUserLoginById", :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
-        { :get_all_contacts => { :input => "GetAllContacts", :output =>"GetAllContacts", :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
-        { :search_user => { :input => "SearchUser", :output =>"SearchUser", :action => "/api/api/SearchUser", :namespace_identifier => nil } }
+        { :get_user_login_by_id => { :input => { "GetUserLoginById" => { "api_key" => ["xsd", "string"], "id" => ["xsd", "int"] }}, :output=>{"GetUserLoginById"=>{"return"=>["xsd", "string"]}}, :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
+        { :get_all_contacts => { :input => {"GetAllContacts" => { "api_key" => ["xsd", "string"], "login"=>["xsd", "string"] }}, :output=>{"GetAllContacts"=>{"return"=>["typens", "McContactArray"]}}, :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
+        { :search_user => { :input => { "SearchUser" => { "api_key" => ["xsd", "string"], "phrase"=>["xsd", "string"], "page"=>["xsd", "string"], "per_page"=>["xsd", "string"] }}, :output=>{"SearchUser"=>{"return"=>["typens", "MpUserArray"]}}, :action => "/api/api/SearchUser", :namespace_identifier => nil } }
       )
     end
+    end
 
   end
 end

data/spec/wasabi/document/savon295_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,11 +7,14 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:savon295).read }
 
-    its(:operations) do
+    describe '#operations' do
+      subject { super().operations }
+      it do
       should include(
-        { :sendsms => { :input => "sendsms", :output => "sendsms", :action => "sendsms", :namespace_identifier => "tns" } }
+        { :sendsms => { :input=>{"sendsms"=>{"sender"=>["xsd", "string"], "cellular"=>["xsd", "string"], "msg"=>["xsd", "string"], "smsnumgroup"=>["xsd", "string"], "emailaddr"=>["xsd", "string"], "udh"=>["xsd", "string"], "datetime"=>["xsd", "string"], "format"=>["xsd", "string"], "dlrurl"=>["xsd", "string"]}}, :output=>{"sendsms"=>{"body"=>["xsd", "string"]}}, :action => "sendsms", :namespace_identifier => 'tns' } }
       )
     end
+    end
 
   end
 end

data/spec/wasabi/document/soap12_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,7 +7,10 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:soap12).read }
 
-    its(:endpoint) { should == URI("http://blogsite.example.com/endpoint12") }
+    describe '#endpoint' do
+      subject { super().endpoint }
+      it { should == URI("http://blogsite.example.com/endpoint12") }
+    end
 
   end
 end

data/spec/wasabi/document/two_bindings_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,17 +7,25 @@ describe Wasabi::Document do
 
     subject { Wasabi::Document.new fixture(:two_bindings).read }
 
-    its(:element_form_default) { should == :unqualified }
+    describe '#element_form_default' do
+      subject { super().element_form_default }
+      it { should == :unqualified }
+    end
 
-    it { should have(3).operations }
+    it 'has 3 operations' do
+      expect(subject.operations.size).to eq(3)
+    end
 
-    its(:operations) do
+    describe '#operations' do
+      subject { super().operations }
+      it do
       should include(
         { :post => { :input => "Post", :action => "Post" } },
         { :post11only => { :input => "Post11only", :action => "Post11only" } },
         { :post12only => { :input => "Post12only", :action => "Post12only" } }
       )
     end
+    end
 
   end
 end

data/spec/wasabi/document_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Document do
@@ -5,20 +7,20 @@ describe Wasabi::Document do
   subject { Wasabi::Document.new fixture(:authentication).read }
 
   it "accepts a URL" do
-    HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
+    expect(HTTPI).to receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
 
     document = Wasabi::Document.new("http://example.com?wsdl")
-    document.xml.should == "wsdl"
+    expect(document.xml).to eq("wsdl")
   end
 
   it "accepts a path" do
     document = Wasabi::Document.new fixture(:authentication).path
-    document.xml.should == fixture(:authentication).read
+    expect(document.xml).to eq(fixture(:authentication).read)
   end
 
   it "accepts raw XML" do
     document = Wasabi::Document.new fixture(:authentication).read
-    document.xml.should == fixture(:authentication).read
+    expect(document.xml).to eq(fixture(:authentication).read)
   end
 
   describe ".validate_element_form_default!" do
@@ -39,13 +41,13 @@ describe Wasabi::Document do
 
   describe "#element_form_default" do
     it "defaults to :unqualified" do
-      subject.element_form_default.should == :unqualified
+      expect(subject.element_form_default).to eq(:unqualified)
     end
 
     [:unqualified, :qualified].each do |value|
       it "accepts :#{value}" do
         subject.element_form_default = value
-        subject.element_form_default.should == value
+        expect(subject.element_form_default).to eq(value)
       end
     end
 

data/spec/wasabi/parser/get_servicename_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Parser do
@@ -12,7 +14,7 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:geotrust).read }
 
     it "returns the #service_name attribute" do
-      subject.service_name.should == "queryDefinitions"
+      expect(subject.service_name).to eq("queryDefinitions")
     end
 
   end

data/spec/wasabi/parser/import_port_types_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Parser do
@@ -14,8 +16,8 @@ describe Wasabi::Parser do
     it "does blow up when portTypes are imported" do
       get_customer = subject.operations[:get_customer]
 
-      get_customer[:input].should == "GetCustomer"
-      get_customer[:namespace_identifier].should be_nil
+      expect(get_customer[:input]).to eq("GetCustomer")
+      expect(get_customer[:namespace_identifier]).to be_nil
     end
 
   end

data/spec/wasabi/parser/juniper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Parser do
@@ -14,9 +16,9 @@ describe Wasabi::Parser do
     it 'does not blow up when an extension base element is defined in an import' do
       request = subject.operations[:get_system_info_request]
 
-      request[:input].should == 'GetSystemInfoRequest'
-      request[:action].should == 'urn:#GetSystemInfoRequest'
-      request[:namespace_identifier].should == 'impl'
+      expect(request[:input]).to eq('GetSystemInfoRequest')
+      expect(request[:action]).to eq('urn:#GetSystemInfoRequest')
+      expect(request[:namespace_identifier]).to eq('impl')
     end
 
   end

data/spec/wasabi/parser/marketo_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Wasabi::Parser do
@@ -11,7 +13,7 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:marketo).read }
 
     it 'parses the operations' do
-      subject.operations[:get_lead][:input].should == 'paramsGetLead'
+      expect(subject.operations[:get_lead][:input]).to eq('paramsGetLead')
     end
   end
 end

data/spec/wasabi/parser/multiple_namespaces_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Wasabi::Parser do
@@ -12,28 +14,28 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:multiple_namespaces).read }
 
     it "lists the types" do
-      subject.types.keys.sort.should == ["Article", "Save"]
+      expect(subject.types.keys.sort).to eq(["Article", "Save"])
     end
 
     it "records the namespace for each type" do
-      subject.types["Save"][:namespace].should == "http://example.com/actions"
+      expect(subject.types["Save"][:namespace]).to eq("http://example.com/actions")
     end
 
     it "records the fields under a type" do
-      subject.types["Save"].keys.should =~ ["article", :namespace, :order!]
+      expect(subject.types["Save"].keys).to match_array(["article", :namespace, :order!])
     end
 
     it "records multiple fields when there are more than one" do
-      subject.types["Article"].keys.should =~ ["Title", "Author", :namespace, :order!]
+      expect(subject.types["Article"].keys).to match_array(["Title", "Author", :namespace, :order!])
     end
 
     it "records the type of a field" do
-      subject.types["Save"]["article"][:type].should == "article:Article"
-      subject.namespaces["article"].should == "http://example.com/article"
+      expect(subject.types["Save"]["article"][:type]).to eq("article:Article")
+      expect(subject.namespaces["article"]).to eq("http://example.com/article")
     end
 
     it "lists the order of the type elements" do
-      subject.types["Article"][:order!].should == ["Author", "Title"]
+      expect(subject.types["Article"][:order!]).to eq(["Author", "Title"])
     end
 
   end

data/spec/wasabi/parser/multiple_parts_in_message_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context 'with: multiple_parts_in_message.wsdl' do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:multiple_parts_in_message).read }
+
+    context "with a parts attribute in soap:body element" do
+      it 'uses the part specified in parts attribute' do
+        request = subject.operations[:some_operation][:input]
+
+        expect(request).to eq("SomeRequestBody")
+      end
+    end
+    
+    context "with no parts attribute in soap:body element" do
+      it 'uses the first part element in message' do
+        request = subject.operations[:other_operation][:input]
+
+        expect(request).to eq("SomeRequest")
+      end
+    end
+    
+  end
+end

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Wasabi::Parser do
@@ -13,14 +15,20 @@ describe Wasabi::Parser do
 
     it 'falls back to using the message type in the port element' do
       # Operation's input has no part element in the message, so using the message type.
-      subject.operations[:save][:input].should == 'Save'
+      expect(subject.operations[:save][:input]).to eq('Save')
 
       # Operation's output has part element in the message, so using part element's type.
-      subject.operations[:save][:output].should == 'SaveResponse'
+      expect(subject.operations[:save][:output]).to eq('SaveResponse')
     end
 
     it 'falls back to using the namespace ID in the port element' do
-      subject.operations[:save][:namespace_identifier].should == 'actions'
+      expect(subject.operations[:save][:namespace_identifier]).to eq('actions')
+    end
+
+    it 'gracefully handles port messages without a colon' do
+      expect(subject.operations[:delete][:input]).to eq('Delete')
+      expect(subject.operations[:delete][:output]).to eq('DeleteResponse')
+      expect(subject.operations[:delete][:namespace_identifier]).to be_nil
     end
   end
 end