!9 Upgrade version to 1.15.0
From: @cherry530 Reviewed-by: @lyn1001 Signed-off-by: @lyn1001
This commit is contained in:
commit
252b386ecd
@ -9,11 +9,12 @@ Subject: [PATCH] RSpec 3.11.0+ distinguish between hashes and Ruby 3 keywords
|
||||
spec/shared/json_common_adapter.rb | 4 ++--
|
||||
3 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
|
||||
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
|
||||
index 58bcc57..fa502ee 100644
|
||||
index 323bff9..b3ffb4f 100644
|
||||
--- a/spec/multi_json_spec.rb
|
||||
+++ b/spec/multi_json_spec.rb
|
||||
@@ -148,8 +148,8 @@ describe MultiJson do
|
||||
@@ -166,8 +166,8 @@
|
||||
end
|
||||
|
||||
it 'sets both load and dump options' do
|
||||
@ -28,7 +29,7 @@ diff --git a/spec/shared/adapter.rb b/spec/shared/adapter.rb
|
||||
index e850b99..52a6bc9 100644
|
||||
--- a/spec/shared/adapter.rb
|
||||
+++ b/spec/shared/adapter.rb
|
||||
@@ -19,7 +19,7 @@ shared_examples_for 'an adapter' do |adapter|
|
||||
@@ -19,7 +19,7 @@
|
||||
before { MultiJson.dump_options = MultiJson.adapter.dump_options = {} }
|
||||
|
||||
after do
|
||||
@ -37,7 +38,7 @@ index e850b99..52a6bc9 100644
|
||||
MultiJson.dump(1, :fizz => 'buzz')
|
||||
MultiJson.dump_options = MultiJson.adapter.dump_options = nil
|
||||
end
|
||||
@@ -100,8 +100,8 @@ shared_examples_for 'an adapter' do |adapter|
|
||||
@@ -100,8 +100,8 @@
|
||||
end
|
||||
|
||||
it 'passes options to the adapter' do
|
||||
@ -48,7 +49,7 @@ index e850b99..52a6bc9 100644
|
||||
end
|
||||
|
||||
it 'dumps custom objects that implement to_json' do
|
||||
@@ -128,7 +128,7 @@ shared_examples_for 'an adapter' do |adapter|
|
||||
@@ -128,7 +128,7 @@ def to_json(*)
|
||||
before { MultiJson.load_options = MultiJson.adapter.load_options = {} }
|
||||
|
||||
after do
|
||||
@ -61,7 +62,7 @@ diff --git a/spec/shared/json_common_adapter.rb b/spec/shared/json_common_adapte
|
||||
index 9597d90..5a23c38 100644
|
||||
--- a/spec/shared/json_common_adapter.rb
|
||||
+++ b/spec/shared/json_common_adapter.rb
|
||||
@@ -15,7 +15,7 @@ shared_examples_for 'JSON-like adapter' do |adapter|
|
||||
@@ -15,7 +15,7 @@
|
||||
describe 'with :indent option' do
|
||||
it 'passes it on dump' do
|
||||
object = 'foo'
|
||||
@ -70,7 +71,7 @@ index 9597d90..5a23c38 100644
|
||||
MultiJson.dump(object, :indent => "\t")
|
||||
end
|
||||
end
|
||||
@@ -23,7 +23,7 @@ shared_examples_for 'JSON-like adapter' do |adapter|
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
describe '.load' do
|
||||
it 'passes :quirks_mode option' do
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
multi_json-1.15.0-tests.tgz
Normal file
BIN
multi_json-1.15.0-tests.tgz
Normal file
Binary file not shown.
BIN
multi_json-1.15.0.gem
Normal file
BIN
multi_json-1.15.0.gem
Normal file
Binary file not shown.
@ -3,17 +3,16 @@
|
||||
|
||||
Summary: A gem to provide swappable JSON backends
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 1.14.1
|
||||
Release: 3
|
||||
Version: 1.15.0
|
||||
Release: 1
|
||||
Group: Development/Languages
|
||||
License: MIT
|
||||
URL: https://github.com/intridea/multi_json
|
||||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||
#git clone https://github.com/intridea/multi_json.git && cd multi_json
|
||||
#git archive -v -o multi_json-1.14.1-tests.tgz v1.14.1 spec/
|
||||
#git archive -v -o multi_json-1.15.0-tests.tgz v1.15.0 spec/
|
||||
Source1: %{gem_name}-%{version}-tests.tgz
|
||||
Source2: https://github.com/intridea/%{gem_name}/archive/refs/tags/%{gem_name}-%{version}.tar.gz
|
||||
Source3: 0001-RSpec-3.11.0-distinguish-between-hashes-and-Ruby-3-keywords.patch
|
||||
Source2: 0001-RSpec-3.11.0-distinguish-between-hashes-and-Ruby-3-keywords.patch
|
||||
|
||||
Requires: ruby(release)
|
||||
BuildRequires: ruby(release)
|
||||
@ -62,7 +61,7 @@ cp -a .%{gem_dir}/* \
|
||||
%check
|
||||
pushd .%{gem_instdir}
|
||||
tar xf %{SOURCE1}
|
||||
cp %{SOURCE3} .
|
||||
cp %{SOURCE2} .
|
||||
patch -p1 < 0001-RSpec-3.11.0-distinguish-between-hashes-and-Ruby-3-keywords.patch
|
||||
sed -i "/expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')/ s/Oj/JsonGem/" spec/multi_json_spec.rb
|
||||
SKIP_ADAPTERS=jr_jackson rspec spec/{multi_json,options_cache}_spec.rb
|
||||
@ -88,6 +87,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 16 2023 xu_ping <707078654@qq.com> - 1.15.0-1
|
||||
- Upgrade version to 1.15.0
|
||||
|
||||
* Thu Jan 12 2023 Ge Wang <wangge20@h-partners.com> - 1.14.1-3
|
||||
- Distinguish between hashes and Ruby 3 keywords
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user