diff --git a/mocha-1.14.0.gem b/mocha-1.14.0.gem
deleted file mode 100644
index 174eb38..0000000
Binary files a/mocha-1.14.0.gem and /dev/null differ
diff --git a/mocha-2.1.0-test.tar.gz b/mocha-2.1.0-test.tar.gz
new file mode 100644
index 0000000..c50726b
Binary files /dev/null and b/mocha-2.1.0-test.tar.gz differ
diff --git a/mocha-2.1.0.gem b/mocha-2.1.0.gem
new file mode 100644
index 0000000..5e5500d
Binary files /dev/null and b/mocha-2.1.0.gem differ
diff --git a/rubygem-mocha.spec b/rubygem-mocha.spec
index db7321b..12d5904 100644
--- a/rubygem-mocha.spec
+++ b/rubygem-mocha.spec
@@ -1,14 +1,19 @@
 %global gem_name mocha
 Summary:             Mocking and stubbing library
 Name:                rubygem-%{gem_name}
-Version:             1.14.0
+Version:             2.1.0
 Release:             1
 License:             MIT or Ruby or BSD
 URL:                 https://github.com/freerange/mocha
 Source0:             http://rubygems.org/gems/mocha-%{version}.gem
-BuildRequires:       ruby(release) rubygems-devel ruby rubygem(metaclass) rubygem(introspection)
-BuildRequires:       rubygem(minitest)
+# git clone https://github.com/freerange/mocha.git && cd mocha
+# git archive -v -o mocha-2.1.0-test.tar.gz v2.1.0 test/
+Source1:             %{gem_name}-%{version}-test.tar.gz
+BuildRequires:       ruby(release) rubygems-devel ruby rubygem(introspection)
+BuildRequires:       rubygem(minitest) rubygem(did_you_mean) rubygem(test-unit)
 BuildArch:           noarch
+%global __requires_exclude ruby2_keywords
+
 %description
 Mocking and stubbing library with JMock/SchMock syntax, which allows mocking
 and stubbing of methods on real (non-mock) classes.
@@ -21,46 +26,53 @@ BuildArch:           noarch
 This package contains documentation for %{name}.
 
 %prep
-%setup -q -c -T
-%gem_install -n %{SOURCE0}
-pushd .%{gem_instdir}
-popd
+%setup -q -n %{gem_name}-%{version} -b 1
 
 %build
+gem build ../%{gem_name}-%{version}.gemspec
+%gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
+cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %check
 pushd .%{gem_instdir}
-ruby -e "Dir.glob('./test/{unit,acceptance}/**/*_test.rb').each {|t| require t}"
-ruby -e "Dir.glob('./test/integration/**/*_test.rb').each {|t| require t}"
+ln -s %{_builddir}/test .
+
+# Each part of test suite must be run separately, otherwise the test suite fails.
+# https://github.com/freerange/mocha/issues/121
+for kind in unit acceptance; do
+  ruby -e "Dir.glob('./test/$kind/**/*_test.rb').each {|t| require t}"
+done
+
+MOCHA_RUN_INTEGRATION_TESTS=minitest ruby -rminitest -e "Dir.glob('./test/integration/**/mini_test_test.rb').each {|t| require t}"
+MOCHA_RUN_INTEGRATION_TESTS=test-unit ruby -rtest/unit -e "Dir.glob('./test/integration/**/test_unit_test.rb').each {|t| require t}"
 popd
 
 %files
 %exclude %{gem_instdir}/.*
-%exclude %{gem_instdir}/init.rb
-%doc %{gem_instdir}/COPYING.md
-%doc %{gem_instdir}/README.md
-%doc %{gem_instdir}/MIT-LICENSE.md
-%doc %{gem_instdir}/RELEASE.md
-%dir %{gem_instdir}
+%license %{gem_instdir}/COPYING.md
+%license %{gem_instdir}/MIT-LICENSE.md
 %{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
-%{gem_instdir}/Gemfile*
 %doc %{gem_docdir}
 %doc %{gem_instdir}/CONTRIBUTING.md
+%{gem_instdir}/Gemfile
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/RELEASE.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/mocha.gemspec
 %{gem_instdir}/gemfiles/
-%{gem_instdir}/yard-templates/
 
 %changelog
+* Wed Jan 24 2024 liyanan <liyanan61@h-partners.com> - 2.1.0-1
+- Upgrade to 2.1.0
+
 * Fri Jul 01 2022 xu_ping <xuping33@h-partners.com> - 1.14.0-1
 - Upgrade 1.14.0