Commit d9b10c7

@@ -9,8 +9,8 @@ xml.Assertion(assertion_options) do
       xml.SubjectConfirmationData '', subject_confirmation_data_options
     end
   end
-  if request.present?
-    xml.Conditions conditions_options do
+  xml.Conditions conditions_options do
+    if request.present?
       xml.AudienceRestriction do
         xml.Audience request.issuer
       end

@@ -43,10 +43,8 @@ module Saml
         end
 
         def subject_confirmation_data_options
-          options = {
-            NotOnOrAfter: 3.hours.since(now).utc.iso8601,
-            Recipient: destination,
-          }
+          options = { NotOnOrAfter: 3.hours.since(now).utc.iso8601 }
+          options[:Recipient] = destination if destination.present?
           options[:InResponseTo] = request.id if request.present?
           options
         end

@@ -50,10 +50,10 @@ module Saml
             ID: id,
             Version: version,
             IssueInstant: now.iso8601,
-            Destination: destination,
             Consent: Namespaces::UNSPECIFIED,
             xmlns: Namespaces::PROTOCOL,
           }
+          options[:Destination] = destination if destination.present?
           options[:InResponseTo] = request.id if request.present?
           options
         end

@@ -567,9 +567,6 @@ XML
       allow(configuration.registry).to receive(:metadata_for).with(configuration.entity_id).and_return(sp)
       result = described_class.build(user, configuration: configuration)
       expect(result).to be_instance_of(described_class)
-      puts result.valid?
-      puts result.errors.full_messages.inspect
-      puts result.to_xml(pretty: true)
       expect(result).to be_valid
     end
   end