diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3 index eecfc44325..d6aaea7f19 100644 --- a/doc/ChangeLog-1.9.3 +++ b/doc/ChangeLog-1.9.3 @@ -92076,7 +92076,7 @@ Mon Sep 1 16:59:10 2003 Nobuyoshi Nakada * eval.c (rb_thread_start_0): should not error_print() within terminated thread, because $stderr used by it might be - overriden now. [ruby-dev:21280] + overridden now. [ruby-dev:21280] Sun Aug 31 22:46:55 2003 WATANABE Hirofumi diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb index 53da90b415..d6654f8053 100644 --- a/lib/bundler/cli/pristine.rb +++ b/lib/bundler/cli/pristine.rb @@ -30,7 +30,7 @@ module Bundler FileUtils.rm_rf spec.full_gem_path when Source::Git if source.local? - Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overriden.") + Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.") next end diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb index 20958ef338..6978f302c1 100644 --- a/spec/bundler/commands/pristine_spec.rb +++ b/spec/bundler/commands/pristine_spec.rb @@ -93,7 +93,7 @@ RSpec.describe "bundle pristine", :ruby_repo do bundle "pristine" expect(changes_txt).to be_file - expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overriden.") + expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overridden.") end end diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index 560979e887..8fa7ba6229 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -230,13 +230,13 @@ class TC_OpenStruct < Test::Unit::TestCase assert_nil os.foo end - def test_overriden_private_methods + def test_overridden_private_methods os = OpenStruct.new(puts: :foo, format: :bar) assert_equal(:foo, os.puts) assert_equal(:bar, os.format) end - def test_overriden_public_methods + def test_overridden_public_methods os = OpenStruct.new(method: :foo, class: :bar) assert_equal(:foo, os.method) assert_equal(:bar, os.class)