Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into gracefully-handle-gem…
Browse files Browse the repository at this point in the history
…specs-with-heredocs-with-method-chains
  • Loading branch information
xlgmokha committed Mar 5, 2021
2 parents c1a9fed + 53793b1 commit d54e24e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions bin/docker-dev-shell
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ docker run --rm -ti \
-v "$(pwd)/bundler/Gemfile:$CODE_DIR/bundler/Gemfile" \
-v "$(pwd)/bundler/dependabot-bundler.gemspec:$CODE_DIR/bundler/dependabot-bundler.gemspec" \
-v "$(pwd)/bundler/lib:$CODE_DIR/bundler/lib" \
-v "$(pwd)/bundler/helpers:$CODE_DIR/bundler/helpers" \
-v "$(pwd)/bundler/spec:$CODE_DIR/bundler/spec" \
-v "$(pwd)/bundler/helpers:/opt/bundler" \
-v "$(pwd)/bundler/helpers:/opt/bundler/helpers" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
let(:current_version) { "1.4.0" }

let(:dependency_files) { project_dependency_files("bundler1/git_source_circular") }
its([:version]) { is_expected.to eq(Gem::Version.new("2.1.0")) }
its([:version]) { is_expected.to eq(Gem::Version.new("2.2.0")) }
end

context "with a ruby exec command that fails" do
Expand Down Expand Up @@ -340,7 +340,7 @@

it "unlocks the latest version" do
expect(resolver.latest_resolvable_version_details[:version]).
to eq(Gem::Version.new("2.1.0"))
to eq(Gem::Version.new("2.2.0"))
end

context "with an upper bound that is lower than the current req" do
Expand Down

0 comments on commit d54e24e

Please sign in to comment.