fix: Fix wrong variable and modify tests

Author: calvin-codecov

codecov_auth/commands/owner/interactors/save_terms_agreement.py

@@ -21,9 +21,10 @@ class SaveTermsAgreementInteractor(BaseInteractor):
     requires_service = False
 
     def validate(self, input: TermsAgreementInput) -> None:
-        if not self.current_user.business_email:
-            raise ValidationError("Business email is required")
-        if not self.current_user.name:
+        print("qwerty input: ", input)
+        if not input.business_email:
+            raise ValidationError("Email is required")
+        if not input.name:
             raise ValidationError("Name is required")
         if not self.current_user.is_authenticated:
             raise Unauthenticated()
@@ -56,5 +57,5 @@ def execute(self, input: Any) -> None:
             marketing_consent=input.get("marketing_consent", False),
             name=input.get("name", ""),
         )
-        self.validate(input)
+        self.validate(typed_input)
         return self.update_terms_agreement(typed_input)

codecov_auth/commands/owner/interactors/tests/test_save_terms_agreement.py

@@ -36,7 +36,11 @@ def execute(self, current_user, input=None):
     def test_update_user_when_agreement_is_false(self):
         self.execute(
             current_user=self.current_user,
-            input={"terms_agreement": False, "customer_intent": "Business"},
+            input={
+                "business_email": "[email protected]",
+                "name": "codecov-user",
+                "terms_agreement": False,
+            },
         )
         before_refresh_business_email = self.current_user.email
 
@@ -50,7 +54,11 @@ def test_update_user_when_agreement_is_false(self):
     def test_update_user_when_agreement_is_true(self):
         self.execute(
             current_user=self.current_user,
-            input={"terms_agreement": True, "customer_intent": "Business"},
+            input={
+                "business_email": "[email protected]",
+                "name": "codecov-user",
+                "terms_agreement": True,
+            },
         )
         before_refresh_business_email = self.current_user.email
 
@@ -61,13 +69,13 @@ def test_update_user_when_agreement_is_true(self):
         assert self.current_user.email == before_refresh_business_email
 
     @freeze_time("2022-01-01T00:00:00")
-    def test_update_owner_and_user_when_email_is_not_empty(self):
+    def test_update_owner_and_user_when_email_and_name_are_not_empty(self):
         self.execute(
             current_user=self.current_user,
             input={
                 "business_email": "[email protected]",
+                "name": "codecov-user",
                 "terms_agreement": True,
-                "customer_intent": "Business",
             },
         )
 
@@ -76,12 +84,23 @@ def test_update_owner_and_user_when_email_is_not_empty(self):
 
         self.current_user.refresh_from_db()
         assert self.current_user.email == "[email protected]"
+        assert self.current_user.name == "codecov-user"
 
-    def test_validation_error_when_customer_intent_invalid(self):
+    def test_validation_error_when_email_invalid(self):
         with pytest.raises(ValidationError):
             self.execute(
                 current_user=self.current_user,
-                input={"terms_agreement": None, "customer_intent": "invalid"},
+                input={"name": "codecov-user", "terms_agreement": True},
+            )
+
+    def test_validation_error_when_name_invalid(self):
+        with pytest.raises(ValidationError):
+            self.execute(
+                current_user=self.current_user,
+                input={
+                    "business_email": "[email protected]",
+                    "terms_agreement": True,
+                },
             )
 
     def test_user_is_not_authenticated(self):
@@ -90,18 +109,19 @@ def test_user_is_not_authenticated(self):
                 current_user=AnonymousUser(),
                 input={
                     "business_email": "[email protected]",
+                    "name": "codecov-user",
                     "terms_agreement": True,
-                    "customer_intent": "Business",
                 },
             )
 
     def test_email_opt_in_saved_in_db(self):
         self.execute(
             current_user=self.current_user,
             input={
+                "business_email": "[email protected]",
+                "name": "codecov-user",
                 "terms_agreement": True,
                 "marketing_consent": True,
-                "customer_intent": "Business",
             },
         )
         self.current_user.refresh_from_db()
@@ -114,9 +134,10 @@ def test_marketo_called_only_with_consent(self, mock_send_data_to_marketo):
         self.execute(
             current_user=self.current_user,
             input={
+                "business_email": "[email protected]",
+                "name": "codecov-user",
                 "terms_agreement": True,
                 "marketing_consent": True,
-                "customer_intent": "Business",
             },
         )
 
@@ -129,9 +150,10 @@ def test_marketo_not_called_without_consent(self, mock_send_data_to_marketo):
         self.execute(
             current_user=self.current_user,
             input={
+                "business_email": "[email protected]",
+                "name": "codecov-user",
                 "terms_agreement": True,
                 "marketing_consent": False,
-                "customer_intent": "Business",
             },
         )
 

utils/test_utils.py

@@ -45,10 +45,10 @@ def app(self) -> str:
     migrate_to = None
 
     def setUp(self) -> None:
-        assert self.migrate_from and self.migrate_to, (
-            "TestCase '{}' must define migrate_from and migrate_to properties".format(
-                type(self).__name__
-            )
+        assert (
+            self.migrate_from and self.migrate_to
+        ), "TestCase '{}' must define migrate_from and migrate_to properties".format(
+            type(self).__name__
         )
         self.migrate_from = [(self.app, self.migrate_from)]
         self.migrate_to = [(self.app, self.migrate_to)]