From 643bc3635e75121826fb878f46ca540ce210bace Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 19 Apr 2021 15:27:09 +0200 Subject: Adding upstream version 0.15.1. Signed-off-by: Daniel Baumann --- qa/expected/test_config/test_config_from_env_1 | 2 +- qa/expected/test_contrib/test_contrib_rules_1 | 2 +- qa/expected/test_contrib/test_contrib_rules_with_config_1 | 2 +- qa/expected/test_user_defined/test_user_defined_rules_examples_1 | 2 +- qa/expected/test_user_defined/test_user_defined_rules_examples_2 | 2 +- .../test_user_defined/test_user_defined_rules_examples_with_config_1 | 2 +- qa/requirements.txt | 4 ++-- qa/test_hooks.py | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'qa') diff --git a/qa/expected/test_config/test_config_from_env_1 b/qa/expected/test_config/test_config_from_env_1 index dd761da..f3947bb 100644 --- a/qa/expected/test_config/test_config_from_env_1 +++ b/qa/expected/test_config/test_config_from_env_1 @@ -85,7 +85,7 @@ is-revert-commit: False Branches: ['master'] Changed Files: {changed_files} ----------------------- -1: CC1 Body does not contain a 'Signed-Off-By' line +1: CC1 Body does not contain a 'Signed-off-by' line 1: CT1 Title does not start with one of fix, feat, chore, docs, style, refactor, perf, test, revert, ci, build 1: T3 Title has trailing punctuation (.) 1: T5 Title contains the word 'WIP' (case-insensitive) diff --git a/qa/expected/test_contrib/test_contrib_rules_1 b/qa/expected/test_contrib/test_contrib_rules_1 index 0d333bc..6876c80 100644 --- a/qa/expected/test_contrib/test_contrib_rules_1 +++ b/qa/expected/test_contrib/test_contrib_rules_1 @@ -1,4 +1,4 @@ -1: CC1 Body does not contain a 'Signed-Off-By' line +1: CC1 Body does not contain a 'Signed-off-by' line 1: CT1 Title does not start with one of fix, feat, chore, docs, style, refactor, perf, test, revert, ci, build: "WIP Thi$ is å title" 1: CT1 Title does not follow ConventionalCommits.org format 'type(optional-scope): description': "WIP Thi$ is å title" 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP Thi$ is å title" diff --git a/qa/expected/test_contrib/test_contrib_rules_with_config_1 b/qa/expected/test_contrib/test_contrib_rules_with_config_1 index 21d467a..d5b5cf8 100644 --- a/qa/expected/test_contrib/test_contrib_rules_with_config_1 +++ b/qa/expected/test_contrib/test_contrib_rules_with_config_1 @@ -1,4 +1,4 @@ -1: CC1 Body does not contain a 'Signed-Off-By' line +1: CC1 Body does not contain a 'Signed-off-by' line 1: CT1 Title does not start with one of föo, bår: "WIP Thi$ is å title" 1: CT1 Title does not follow ConventionalCommits.org format 'type(optional-scope): description': "WIP Thi$ is å title" 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP Thi$ is å title" diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_1 b/qa/expected/test_user_defined/test_user_defined_rules_examples_1 index 9d00445..44add31 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_1 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_1 @@ -1,5 +1,5 @@ 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: Thi$ is å title" -1: UC2 Body does not contain a 'Signed-Off-By' line +1: UC2 Body does not contain a 'Signed-off-by' line 1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$': "WIP: Thi$ is å title" 2: B4 Second line is not empty: "Content on the second line" diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 index 31a9280..11766fc 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 @@ -1,4 +1,4 @@ -1: UC2 Body does not contain a 'Signed-Off-By' line +1: UC2 Body does not contain a 'Signed-off-by' line 1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$' 2: B4 Second line is not empty diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 b/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 index a143715..f514f5d 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 @@ -1,6 +1,6 @@ 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: Thi$ is å title" 1: UC1 Body contains too many lines (2 > 1) -1: UC2 Body does not contain a 'Signed-Off-By' line +1: UC2 Body does not contain a 'Signed-off-by' line 1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$': "WIP: Thi$ is å title" 2: B4 Second line is not empty: "Content on the second line" diff --git a/qa/requirements.txt b/qa/requirements.txt index 32f4662..95d49d4 100644 --- a/qa/requirements.txt +++ b/qa/requirements.txt @@ -1,4 +1,4 @@ sh==1.14.1 -pytest==6.1.2; -arrow==0.17.0; +pytest==6.2.3; +arrow==1.0.3; gitlint # no version as you want to test the currently installed version diff --git a/qa/test_hooks.py b/qa/test_hooks.py index 80ccbf6..32abcb0 100644 --- a/qa/test_hooks.py +++ b/qa/test_hooks.py @@ -14,7 +14,7 @@ class HookTests(BaseTestCase): u'2: B4 Second line is not empty: "Contënt on the second line"\n', '3: B6 Body message is missing\n', '-----------------------------------------------\n', - 'gitlint: \x1b[31mYour commit message contains the above violations.\x1b[0m\n'] + 'gitlint: \x1b[31mYour commit message contains violations.\x1b[0m\n'] def setUp(self): self.responses = [] @@ -48,7 +48,7 @@ class HookTests(BaseTestCase): def _interact(self, line, stdin): self.githook_output.append(line) # Answer 'yes' to question to keep violating commit-msg - if "Your commit message contains the above violations" in line: + if "Your commit message contains violations" in line: response = self.responses[self.response_index] stdin.put(f"{response}\n") self.response_index = (self.response_index + 1) % len(self.responses) -- cgit v1.2.3