diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-01-10 13:55:24 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-01-10 13:55:24 +0900 |
| commit | 8274d82f69a9e57128f38eaea7a171ac1e5b2605 (patch) | |
| tree | 1adbea462794ee9d9f09a7e7d593fb60bea967d2 | |
| parent | 20839c0bddbc331b9cb87f7caef21cd3776940d2 (diff) | |
| download | bundler-typo-fix.tar.gz | |
typofix by misspelltypo-fix
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | spec/commands/exec_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf9abe033..22dd5f53db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Bugfixes: - avoid an error when running `bundle update --group` ([#6156](https://github.com/bundler/bundler/issues/6156), @mattbrictson) - ensure the resolver prefers non-pre-release gems when possible ([#6181](https://github.com/bundler/bundler/issues/6181), @greysteil) - include bundler's gemspec in the built gem ([#6165](https://github.com/bundler/bundler/issues/6165), @dr-itz) - - ensure locally installed specs are not overriden by those in remote sources during dependency resolution ([#6072](https://github.com/bundler/bundler/issues/6072), @indirect) + - ensure locally installed specs are not overridden by those in remote sources during dependency resolution ([#6072](https://github.com/bundler/bundler/issues/6072), @indirect) - ensure custom gemfiles are respected in generated binstubs (@pftg) - fail gracefully when loading a bundler-generated binstub when `bin/bundle` was not generated by bundler ([#6149](https://github.com/bundler/bundler/issues/6149), @hsbt) - allow `bundle init` to be run even when a parent directory contains a gemfile ([#6205](https://github.com/bundler/bundler/issues/6205), @colby-swandale) diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index af88f3f043..0bda2504de 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -784,7 +784,7 @@ __FILE__: #{path.to_s.inspect} expect(bundle!("exec #{file}", :artifice => nil)).to eq(expected) expect(bundle!("exec bundle exec #{file}", :artifice => nil)).to eq(expected) expect(bundle!("exec ruby #{file}", :artifice => nil)).to eq(expected) - # Ignore expectaion for default bundler gem conflict. + # Ignore expectation for default bundler gem conflict. unless ENV["BUNDLER_SPEC_SUB_VERSION"] expect(run!(file.read, :no_lib => true, :artifice => nil)).to eq(expected) end |