diff --git a/CHANGELOG.md b/CHANGELOG.md index 5edbb9e..63031b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Changelog for the gruf-rspec gem. ### Pending release +### 0.1.2 + +* Fix issue with RSPEC_NAMESPACE conflicts with other gems + ### 0.1.1 * Add be_a_successful_rpc matcher that matches on success and the appropriate response class diff --git a/lib/gruf/rspec.rb b/lib/gruf/rspec.rb index 33f0fae..3c9e9c2 100644 --- a/lib/gruf/rspec.rb +++ b/lib/gruf/rspec.rb @@ -16,12 +16,12 @@ begin require 'rspec/core' require 'rspec/expectations' - RSPEC_NAMESPACE = RSpec - RSPEC_RUNNER = RSpec + GRUF_RSPEC_NAMESPACE = RSpec + GRUF_RSPEC_RUNNER = RSpec rescue LoadError # old rspec compat require 'spec' - RSPEC_NAMESPACE = Spec - RSPEC_RUNNER = Spec::Runner + GRUF_RSPEC_NAMESPACE = Spec + GRUF_RSPEC_RUNNER = Spec::Runner end require_relative 'rspec/version' @@ -37,7 +37,7 @@ module Rspec Gruf::Rspec.reset # initial reset -RSPEC_RUNNER.configure do |config| +GRUF_RSPEC_RUNNER.configure do |config| config.include Gruf::Rspec::Helpers config.define_derived_metadata(file_path: Regexp.new(Gruf::Rspec.rpc_spec_path)) do |metadata| @@ -68,7 +68,7 @@ module Rspec end end -RSPEC_NAMESPACE::Matchers.define :raise_rpc_error do |expected_error_class| +GRUF_RSPEC_NAMESPACE::Matchers.define :raise_rpc_error do |expected_error_class| supports_block_expectations def with_serialized(&block) @@ -90,7 +90,7 @@ def with_serialized(&block) end end -RSPEC_NAMESPACE::Matchers.define :be_a_successful_rpc do |_| +GRUF_RSPEC_NAMESPACE::Matchers.define :be_a_successful_rpc do |_| match do |actual| if !gruf_controller || actual.is_a?(GRPC::BadStatus) || actual.is_a?(GRPC::Core::CallError) false diff --git a/lib/gruf/rspec/version.rb b/lib/gruf/rspec/version.rb index 1c753cb..6910a65 100644 --- a/lib/gruf/rspec/version.rb +++ b/lib/gruf/rspec/version.rb @@ -15,6 +15,6 @@ # module Gruf module Rspec - VERSION = '0.1.1'.freeze + VERSION = '0.1.2'.freeze end end