Apply defaults to all of the configs. Much fewer .get()s

tests/clientlib/validate_config_test.py

@@ -7,6 +7,7 @@ from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import InvalidConfigError
 from pre_commit.clientlib.validate_config import run
 from pre_commit.clientlib.validate_config import validate_config_extra
+from pre_commit.jsonschema_extensions import apply_defaults
 
 
 def test_returns_0_for_valid_config():
@@ -78,28 +79,50 @@ def test_is_valid_according_to_schema(manifest_obj, expected):
 def test_config_with_failing_regexes_fails():
     with pytest.raises(InvalidConfigError):
         # Note the regex '(' is invalid (unbalanced parens)
-        validate_config_extra([{
-            'repo': 'foo', 'hooks': [{'id': 'hook_id', 'files': '('}]
-        }])
+        config = apply_defaults(
+            [{
+                'repo': 'foo',
+                'sha': 'foo',
+                'hooks': [{'id': 'hook_id', 'files': '('}],
+            }],
+            CONFIG_JSON_SCHEMA,
+        )
+        validate_config_extra(config)
 
 
 def test_config_with_ok_regexes_passes():
-    validate_config_extra([{
-        'repo': 'foo', 'hooks': [{'id': 'hook_id', 'files': '\.py$'}],
-    }])
+    config = apply_defaults(
+        [{
+            'repo': 'foo',
+            'sha': 'foo',
+            'hooks': [{'id': 'hook_id', 'files': '\.py$'}],
+        }],
+        CONFIG_JSON_SCHEMA,
+    )
+    validate_config_extra(config)
 
 
 def test_config_with_invalid_exclude_regex_fails():
     with pytest.raises(InvalidConfigError):
-        # NOte the regex '(' is invalid (unbalanced parens)
-        validate_config_extra([{
-            'repo': 'foo',
-            'hooks': [{'id': 'hook_id', 'files': '', 'exclude': '('}],
-        }])
+        # Note the regex '(' is invalid (unbalanced parens)
+        config = apply_defaults(
+            [{
+                'repo': 'foo',
+                'sha': 'foo',
+                'hooks': [{'id': 'hook_id', 'files': '', 'exclude': '('}],
+            }],
+            CONFIG_JSON_SCHEMA,
+        )
+        validate_config_extra(config)
 
 
 def test_config_with_ok_exclude_regex_passes():
-    validate_config_extra([{
-        'repo': 'foo',
-        'hooks': [{'id': 'hook_id', 'files': '', 'exclude': '^vendor/'}],
-    }])
+    config = apply_defaults(
+        [{
+            'repo': 'foo',
+            'sha': 'foo',
+            'hooks': [{'id': 'hook_id', 'files': '', 'exclude': '^vendor/'}],
+        }],
+        CONFIG_JSON_SCHEMA,
+    )
+    validate_config_extra(config)

tests/clientlib/validate_manifest_test.py

@@ -27,11 +27,10 @@ def test_additional_manifest_check_raises_for_bad_language():
 
 
 @pytest.mark.parametrize(('obj'), (
-    [{}],
     [{'language': 'python'}],
     [{'language': 'ruby'}],
 ))
-def test_additional_manifest_check_is_ok_with_missing_language(obj):
+def test_additional_manifest_check_languages(obj):
     additional_manifest_check(obj)
 
 

tests/commands_test.py

@@ -1,5 +1,4 @@
 
-import jsonschema
 import os
 import os.path
 import pkg_resources
@@ -18,6 +17,7 @@ from pre_commit.commands import install
 from pre_commit.commands import RepositoryCannotBeUpdatedError
 from pre_commit.commands import uninstall
 from pre_commit.commands import _update_repository
+from pre_commit.jsonschema_extensions import apply_defaults
 from pre_commit.ordereddict import OrderedDict
 from pre_commit.runner import Runner
 from pre_commit.yaml_extensions import ordered_dump
@@ -60,8 +60,9 @@ def up_to_date_repo(python_hooks_repo):
         ('sha', git.get_head_sha(python_hooks_repo)),
         ('hooks', [OrderedDict((('id', 'foo'), ('files', '')))]),
     ))
-    jsonschema.validate([config], CONFIG_JSON_SCHEMA)
-    validate_config_extra([config])
+    wrapped_config = apply_defaults([config], CONFIG_JSON_SCHEMA)
+    validate_config_extra(wrapped_config)
+    config = wrapped_config[0]
 
     with open(os.path.join(python_hooks_repo, C.CONFIG_FILE), 'w') as file_obj:
         file_obj.write(
@@ -96,8 +97,9 @@ def out_of_date_repo(python_hooks_repo):
         ('sha', git.get_head_sha(python_hooks_repo)),
         ('hooks', [OrderedDict((('id', 'foo'), ('files', '')))]),
     ))
-    jsonschema.validate([config], CONFIG_JSON_SCHEMA)
-    validate_config_extra([config])
+    config_wrapped = apply_defaults([config], CONFIG_JSON_SCHEMA)
+    validate_config_extra(config_wrapped)
+    config = config_wrapped[0]
     local['git']['commit', '--allow-empty', '-m', 'foo']()
     head_sha = git.get_head_sha(python_hooks_repo)
 
@@ -135,8 +137,9 @@ def hook_disappearing_repo(python_hooks_repo):
         ('sha', git.get_head_sha(python_hooks_repo)),
         ('hooks', [OrderedDict((('id', 'foo'), ('files', '')))]),
     ))
-    jsonschema.validate([config], CONFIG_JSON_SCHEMA)
-    validate_config_extra([config])
+    config_wrapped = apply_defaults([config], CONFIG_JSON_SCHEMA)
+    validate_config_extra(config_wrapped)
+    config = config_wrapped[0]
     shutil.copy(get_resource_path('manifest_without_foo.yaml'), C.MANIFEST_FILE)
     local['git']['add', '.']()
     local['git']['commit', '-m', 'Remove foo']()

tests/conftest.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-import jsonschema
 import pytest
 import time
 from plumbum import local
@@ -8,6 +7,7 @@ from plumbum import local
 from pre_commit import git
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import validate_config_extra
+from pre_commit.jsonschema_extensions import apply_defaults
 from testing.util import copy_tree_to_path
 from testing.util import get_resource_path
 
@@ -69,9 +69,9 @@ def _make_config(path, hook_id, file_regex):
         'sha': git.get_head_sha(path),
         'hooks': [{'id': hook_id, 'files': file_regex}],
     }
-    jsonschema.validate([config], CONFIG_JSON_SCHEMA)
-    validate_config_extra([config])
-    return config
+    config_wrapped = apply_defaults([config], CONFIG_JSON_SCHEMA)
+    validate_config_extra(config_wrapped)
+    return config_wrapped[0]
 
 
 @pytest.yield_fixture

tests/repository_test.py

@@ -1,11 +1,11 @@
 import os
-import jsonschema
 import pytest
 
 import pre_commit.constants as C
 from pre_commit import git
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import validate_config_extra
+from pre_commit.jsonschema_extensions import apply_defaults
 from pre_commit.prefixed_command_runner import PrefixedCommandRunner
 from pre_commit.repository import Repository
 
@@ -111,9 +111,9 @@ def mock_repo_config():
             'files': '\.py$',
         }],
     }
-    jsonschema.validate([config], CONFIG_JSON_SCHEMA)
-    validate_config_extra([config])
-    return config
+    config_wrapped = apply_defaults([config], CONFIG_JSON_SCHEMA)
+    validate_config_extra(config_wrapped)
+    return config_wrapped[0]
 
 
 def test_repo_url(mock_repo_config):