Commit 1c52448

@@ -88,7 +88,7 @@ RSpec.describe Saml::Kit::Bindings::HttpRedirect do
       end
       allow(Saml::Kit.configuration.registry).to receive(:metadata_for).with(issuer).and_return(provider)
 
-      url, _ = subject.serialize(Saml::Kit::Builders::AuthenticationRequest.new)
+      url, _ = subject.serialize(Saml::Kit::AuthenticationRequest.builder_class.new)
       result = subject.deserialize(query_params_from(url))
       expect(result).to be_instance_of(Saml::Kit::AuthenticationRequest)
       expect(result).to be_valid

@@ -4,14 +4,14 @@ RSpec.describe Saml::Kit::DefaultRegistry do
   subject { described_class.new }
   let(:entity_id) { FFaker::Internet.http_url }
   let(:service_provider_metadata) do
-    builder = Saml::Kit::Builders::ServiceProviderMetadata.new
-    builder.entity_id = entity_id
-    builder.build
+    Saml::Kit::ServiceProviderMetadata.build do |builder|
+      builder.entity_id = entity_id
+    end
   end
   let(:identity_provider_metadata) do
-    builder = Saml::Kit::Builders::IdentityProviderMetadata.new
-    builder.entity_id = entity_id
-    builder.build
+    Saml::Kit::IdentityProviderMetadata.build do |builder|
+      builder.entity_id = entity_id
+    end
   end
 
   describe "#metadata_for" do