diff options
-rw-r--r-- | spec/bundler/bundler/installer/gem_installer_spec.rb | 15 | ||||
-rw-r--r-- | tool/bundler/dev_gems.rb | 6 | ||||
-rw-r--r-- | tool/bundler/dev_gems.rb.lock | 21 | ||||
-rw-r--r-- | tool/bundler/rubocop_gems.rb.lock | 6 | ||||
-rw-r--r-- | tool/bundler/standard_gems.rb.lock | 6 |
5 files changed, 29 insertions, 25 deletions
diff --git a/spec/bundler/bundler/installer/gem_installer_spec.rb b/spec/bundler/bundler/installer/gem_installer_spec.rb index 14a6a19a86..e86bdf009a 100644 --- a/spec/bundler/bundler/installer/gem_installer_spec.rb +++ b/spec/bundler/bundler/installer/gem_installer_spec.rb @@ -12,7 +12,10 @@ RSpec.describe Bundler::GemInstaller do context "spec_settings is nil" do it "invokes install method with empty build_args" do - allow(spec_source).to receive(:install).with(spec, :force => false, :ensure_builtin_gems_cached => false, :build_args => [], :previous_spec => nil) + allow(spec_source).to receive(:install).with( + spec, + { :force => false, :ensure_builtin_gems_cached => false, :build_args => [], :previous_spec => nil } + ) subject.install_from_spec end end @@ -23,7 +26,10 @@ RSpec.describe Bundler::GemInstaller do allow(Bundler.settings).to receive(:[]).with(:inline) allow(Bundler.settings).to receive(:[]).with(:forget_cli_options) allow(Bundler.settings).to receive(:[]).with("build.dummy").and_return("--with-dummy-config=dummy") - expect(spec_source).to receive(:install).with(spec, :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy"], :previous_spec => nil) + expect(spec_source).to receive(:install).with( + spec, + { :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy"], :previous_spec => nil } + ) subject.install_from_spec end end @@ -36,10 +42,7 @@ RSpec.describe Bundler::GemInstaller do allow(Bundler.settings).to receive(:[]).with("build.dummy").and_return("--with-dummy-config=dummy --with-another-dummy-config") expect(spec_source).to receive(:install).with( spec, - :force => false, - :ensure_builtin_gems_cached => false, - :build_args => ["--with-dummy-config=dummy", "--with-another-dummy-config"], - :previous_spec => nil + { :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy", "--with-another-dummy-config"], :previous_spec => nil } ) subject.install_from_spec end diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb index 0e5e681f73..abeb25821b 100644 --- a/tool/bundler/dev_gems.rb +++ b/tool/bundler/dev_gems.rb @@ -9,9 +9,9 @@ gem "rake", "~> 13.0" gem "webrick", "~> 1.6" gem "parallel_tests", "~> 2.29" gem "parallel", "1.19.2" # 1.20+ is required > Ruby 2.3 -gem "rspec-core", "~> 3.8" -gem "rspec-expectations", "~> 3.8" -gem "rspec-mocks", "~> 3.11.1" +gem "rspec-core", "~> 3.12" +gem "rspec-expectations", "~> 3.12" +gem "rspec-mocks", "~> 3.12" gem "uri", "~> 0.10.1" group :doc do diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock index feb3cc22fd..526d7d3d86 100644 --- a/tool/bundler/dev_gems.rb.lock +++ b/tool/bundler/dev_gems.rb.lock @@ -3,6 +3,7 @@ GEM specs: diff-lcs (1.5.0) hpricot (0.8.6) + hpricot (0.8.6-java) mustache (1.1.1) parallel (1.19.2) parallel_tests (2.32.0) @@ -15,15 +16,15 @@ GEM hpricot (>= 0.8.2) mustache (>= 0.7.0) rdiscount (>= 1.5.8) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) test-unit (3.5.3) power_assert uri (0.10.1) @@ -45,9 +46,9 @@ DEPENDENCIES rake (~> 13.0) rdoc (= 6.2.0) ronn (~> 0.7.3) - rspec-core (~> 3.8) - rspec-expectations (~> 3.8) - rspec-mocks (~> 3.11.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) test-unit (~> 3.0) uri (~> 0.10.1) webrick (~> 1.6) diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock index 2e47e5a894..d706d0ce62 100644 --- a/tool/bundler/rubocop_gems.rb.lock +++ b/tool/bundler/rubocop_gems.rb.lock @@ -18,12 +18,12 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock index bf21ad5da2..fcac98fe27 100644 --- a/tool/bundler/standard_gems.rb.lock +++ b/tool/bundler/standard_gems.rb.lock @@ -18,12 +18,12 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) |