test for both click <8 and >=8 error messages

Author: tora-kozic

setup.py

@@ -32,7 +32,7 @@
     python_requires=">=3.6.2, <4",
     install_requires=[
         "chardet",
-        "click>=8.0.0",
+        "click>=7.1.1",
         "click_plugins>=1.1.1",
         "colorama>=0.4.3",
         "keyring==18.0.1",

tests/cmds/test_departing_employee.py

@@ -370,6 +370,8 @@ def test_add_departing_employee_when_invalid_date_validation_raises_error(
     assert (
         "Invalid value for '--departure-date': '2020-02-30' does not match the format '%Y-%m-%d'"
         in result.output  # invalid datetime format
+    ) or (
+        "Invalid value for '--departure-date': invalid datetime format" in result.output
     )
 
 
@@ -392,6 +394,8 @@ def test_add_departing_employee_when_invalid_date_format_validation_raises_error
     assert (
         "Invalid value for '--departure-date': '2020-30-01' does not match the format '%Y-%m-%d'"
         in result.output
+    ) or (
+        "Invalid value for '--departure-date': invalid datetime format" in result.output
     )
 
 

tests/cmds/test_securitydata.py

@@ -329,7 +329,7 @@ def test_search_and_send_to_when_advanced_query_passed_non_existent_filename_rai
         assert (
             " Invalid value for '--advanced-query': 'not_a_file': No such file or directory"
             in result.stdout
-        )
+        ) or ("Could not open file: not_a_file" in result.stdout)
 
 
 @search_and_send_to_test
@@ -727,7 +727,9 @@ def test_search_and_send_to_when_given_invalid_exposure_type_causes_exit(
         obj=cli_state,
     )
     assert result.exit_code == 2
-    assert "Invalid value" in result.output
+    assert (
+        "Invalid value" in result.output or "invalid choice: NotValid" in result.output
+    )
 
 
 @search_and_send_to_test

tests/cmds/test_trustedactivities.py

@@ -114,7 +114,10 @@ def test_create_when_missing_type_prints_error(runner, cli_state):
     command = ["trusted-activities", "create", "--description", "description"]
     result = runner.invoke(cli, command, obj=cli_state)
     assert result.exit_code == 2
-    assert MISSING_TYPE in result.output
+    assert (
+        MISSING_TYPE in result.output
+        or MISSING_ARGUMENT_ERROR.format("[DOMAIN|SLACK]") in result.output
+    )
 
 
 def test_create_when_missing_value_prints_error(runner, cli_state):