Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ appraise "rack-2" do
end

appraise "activesupport" do
gem "activesupport", "~> 5.1"
gem "activesupport", "~> 6.1"
if RUBY_VERSION >= "3.4"
gem "csv"
gem "mutex_m"
Expand Down
4 changes: 3 additions & 1 deletion lib/pact/consumer/grpc_interaction_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ def execute(&block)
end

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(message_pact, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

result = PactFfi::PluginConsumer.interaction_contents(message_pact, 0, GRPC_CONTENT_TYPE, interaction_json)
Expand Down
4 changes: 3 additions & 1 deletion lib/pact/consumer/http_interaction_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ def execute(&block)
raise InteractionBuilderError.new("interaction is designed to be used one-time only") if defined?(@used)

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(pact_interaction, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

mock_server = MockServer.create_for_http!(
Expand Down
4 changes: 3 additions & 1 deletion lib/pact/consumer/message_interaction_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ def execute(&block)
message_pact = PactFfi::MessageConsumer.new_message_interaction(pact_handle, @description)

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(message_pact, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

configure_interaction!(message_pact)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ def execute(&block)
interaction = PactFfi::AsyncMessageConsumer.new(pact_handle, @description)

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(interaction, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

@provider_state_meta&.each_pair do |provider_state, meta|
Expand Down
4 changes: 3 additions & 1 deletion lib/pact/consumer/plugin_http_interaction_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ def execute(&block)
interaction = PactFfi.new_interaction(pact_handle, @description)

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(interaction, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

@provider_state_meta&.each_pair do |provider_state, meta|
Expand Down
4 changes: 3 additions & 1 deletion lib/pact/consumer/plugin_sync_message_interaction_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ def execute(&block)
message_pact = PactFfi::SyncMessageConsumer.new_interaction(pact_handle, @description)

@references.each do |group, name, value|
PactFfi.add_interaction_reference(pact_handle, group, name, value)
next if PactFfi.add_interaction_reference(message_pact, group, name, value)

raise InteractionBuilderError.new("could not add reference #{group}/#{name}")
end

@provider_state_meta&.each_pair do |provider_state, meta|
Expand Down
8 changes: 2 additions & 6 deletions pact.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ Gem::Specification.new do |gem|
# For Kafka support
unless RUBY_PLATFORM =~ /win32|x64-mingw32|x64-mingw-ucrt/
# windows does not support librdkafka
gem.add_development_dependency 'sbmt-kafka_consumer', '>= 2.0.1'
gem.add_development_dependency 'sbmt-kafka_producer', '>= 1.0'
end
if ENV['X_PACT_DEVELOPMENT_RDKAFKA'] == 'true'
# darwin-arm64 prebuilt gems available from 0.20.0
gem.add_development_dependency 'karafka-rdkafka', '>= 0.20.0'
gem.add_development_dependency 'sbmt-kafka_consumer', '>= 3.0.0'
gem.add_development_dependency 'sbmt-kafka_producer', '>= 3.0.0'
end
# For gRPC support
gem.add_development_dependency 'gruf', '>= 2.18'
Expand Down
17 changes: 17 additions & 0 deletions spec/lib/consumer/message_interaction_builder_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,22 @@
subject.reference('group', 'name', '')
end.to raise_error(described_class::InteractionBuilderError, /value is required/)
end

it 'writes the reference to the interaction in the pact file' do
Dir.mktmpdir do |dir|
config = Pact::Consumer::PactConfig::Message.new(
consumer_name: 'reference-consumer', provider_name: 'reference-provider', opts: {pact_dir: dir}
)
config.new_interaction('a referenced message')
.with_json_contents(id: 1)
.reference('AsyncAPI', 'operationId', 'publishThing')
.execute { |_payload, _meta| }

pact = JSON.parse(File.read(File.join(dir, 'reference-consumer-reference-provider.json')))
expect(pact['interactions'].first.dig('comments', 'references')).to eq(
'AsyncAPI' => {'operationId' => 'publishThing'}
)
end
end
end
end
Loading