mirror of
https://github.com/pre-commit/pre-commit.git
synced 2026-02-17 08:14:42 +04:00
Use more inclusive language
Committed via https://github.com/asottile/all-repos
This commit is contained in:
parent
2c28197c2a
commit
3922263f8c
11 changed files with 25 additions and 25 deletions
|
|
@ -526,9 +526,9 @@ def test_merge_conflict(cap_out, store, in_merge_conflict):
|
|||
|
||||
def test_merge_conflict_modified(cap_out, store, in_merge_conflict):
|
||||
# Touch another file so we have unstaged non-conflicting things
|
||||
assert os.path.exists('dummy')
|
||||
with open('dummy', 'w') as dummy_file:
|
||||
dummy_file.write('bar\nbaz\n')
|
||||
assert os.path.exists('placeholder')
|
||||
with open('placeholder', 'w') as placeholder_file:
|
||||
placeholder_file.write('bar\nbaz\n')
|
||||
|
||||
ret, printed = _do_run(cap_out, store, in_merge_conflict, run_opts())
|
||||
assert ret == 1
|
||||
|
|
@ -831,9 +831,9 @@ def test_local_hook_passes(cap_out, store, repo_with_passing_hook):
|
|||
}
|
||||
add_config_to_repo(repo_with_passing_hook, config)
|
||||
|
||||
with open('dummy.py', 'w') as staged_file:
|
||||
with open('placeholder.py', 'w') as staged_file:
|
||||
staged_file.write('"""TODO: something"""\n')
|
||||
cmd_output('git', 'add', 'dummy.py')
|
||||
cmd_output('git', 'add', 'placeholder.py')
|
||||
|
||||
_test_run(
|
||||
cap_out,
|
||||
|
|
@ -858,9 +858,9 @@ def test_local_hook_fails(cap_out, store, repo_with_passing_hook):
|
|||
}
|
||||
add_config_to_repo(repo_with_passing_hook, config)
|
||||
|
||||
with open('dummy.py', 'w') as staged_file:
|
||||
with open('placeholder.py', 'w') as staged_file:
|
||||
staged_file.write('"""TODO: something"""\n')
|
||||
cmd_output('git', 'add', 'dummy.py')
|
||||
cmd_output('git', 'add', 'placeholder.py')
|
||||
|
||||
_test_run(
|
||||
cap_out,
|
||||
|
|
|
|||
|
|
@ -90,8 +90,8 @@ def _make_conflict():
|
|||
@pytest.fixture
|
||||
def in_merge_conflict(tempdir_factory):
|
||||
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
|
||||
open(os.path.join(path, 'dummy'), 'a').close()
|
||||
cmd_output('git', 'add', 'dummy', cwd=path)
|
||||
open(os.path.join(path, 'placeholder'), 'a').close()
|
||||
cmd_output('git', 'add', 'placeholder', cwd=path)
|
||||
git_commit(msg=in_merge_conflict.__name__, cwd=path)
|
||||
|
||||
conflict_path = tempdir_factory.get()
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ def test_uses_system_if_both_gem_and_ruby_are_available(find_exe_mck):
|
|||
def fake_gem_prefix(tmpdir):
|
||||
gemspec = '''\
|
||||
Gem::Specification.new do |s|
|
||||
s.name = 'pre_commit_dummy_package'
|
||||
s.name = 'pre_commit_placeholder_package'
|
||||
s.version = '0.0.0'
|
||||
s.summary = 'dummy gem for pre-commit hooks'
|
||||
s.summary = 'placeholder gem for pre-commit hooks'
|
||||
s.authors = ['Anthony Sottile']
|
||||
end
|
||||
'''
|
||||
tmpdir.join('dummy_gem.gemspec').write(gemspec)
|
||||
tmpdir.join('placeholder_gem.gemspec').write(gemspec)
|
||||
yield Prefix(tmpdir)
|
||||
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ def test_install_ruby_system(fake_gem_prefix):
|
|||
# Should be able to activate and use rbenv install
|
||||
with ruby.in_env(fake_gem_prefix, 'system'):
|
||||
_, out, _ = cmd_output('gem', 'list')
|
||||
assert 'pre_commit_dummy_package' in out
|
||||
assert 'pre_commit_placeholder_package' in out
|
||||
|
||||
|
||||
@xfailif_windows # pragma: win32 no cover
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue