Skip to content

Commit

Permalink
Email.id is an int not a string (#14256)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstufft
dstufft authored Aug 1, 2023
1 parent 614b069 commit af0875b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions tests/unit/manage/test_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,13 @@ def test_add_email_validation_fails(self, monkeypatch):
assert request.session.flash.calls == []

def test_delete_email(self, monkeypatch):
email = pretend.stub(id=pretend.stub(), primary=False, email=pretend.stub())
email = pretend.stub(id=5, primary=False, email=pretend.stub())
some_other_email = pretend.stub()
user_service = pretend.stub(
record_event=pretend.call_recorder(lambda *a, **kw: None)
)
request = pretend.stub(
POST={"delete_email_id": email.id},
POST={"delete_email_id": str(email.id)},
user=pretend.stub(
id=pretend.stub(),
emails=[email, some_other_email],
Expand Down Expand Up @@ -406,7 +406,7 @@ def raise_no_result():
raise NoResultFound

request = pretend.stub(
POST={"delete_email_id": "missing_id"},
POST={"delete_email_id": "999999999999"},
user=pretend.stub(id=pretend.stub(), emails=[email], name=pretend.stub()),
db=pretend.stub(
query=lambda a: pretend.stub(
Expand All @@ -431,7 +431,7 @@ def test_delete_email_is_primary(self, monkeypatch):
email = pretend.stub(primary=True)

request = pretend.stub(
POST={"delete_email_id": "missing_id"},
POST={"delete_email_id": "99999"},
user=pretend.stub(id=pretend.stub(), emails=[email], name=pretend.stub()),
db=pretend.stub(
query=lambda a: pretend.stub(
Expand Down Expand Up @@ -462,7 +462,7 @@ def test_change_primary_email(self, monkeypatch, db_request):

user_service = pretend.stub()
db_request.find_service = lambda *a, **kw: user_service
db_request.POST = {"primary_email_id": new_primary.id}
db_request.POST = {"primary_email_id": str(new_primary.id)}
db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
monkeypatch.setattr(
views.ManageAccountViews, "default_response", {"_": pretend.stub()}
Expand Down Expand Up @@ -500,7 +500,7 @@ def test_change_primary_email_without_current(self, monkeypatch, db_request):

user_service = pretend.stub()
db_request.find_service = lambda *a, **kw: user_service
db_request.POST = {"primary_email_id": new_primary.id}
db_request.POST = {"primary_email_id": str(new_primary.id)}
db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
monkeypatch.setattr(
views.ManageAccountViews, "default_response", {"_": pretend.stub()}
Expand Down Expand Up @@ -533,7 +533,7 @@ def test_change_primary_email_not_found(self, monkeypatch, db_request):

db_request.user = user
db_request.find_service = lambda *a, **kw: pretend.stub()
db_request.POST = {"primary_email_id": missing_email_id}
db_request.POST = {"primary_email_id": str(missing_email_id)}
db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
monkeypatch.setattr(
views.ManageAccountViews, "default_response", {"_": pretend.stub()}
Expand All @@ -556,7 +556,7 @@ def test_reverify_email(self, monkeypatch):
)

request = pretend.stub(
POST={"reverify_email_id": pretend.stub()},
POST={"reverify_email_id": "99999"},
db=pretend.stub(
query=lambda *a: pretend.stub(
filter=lambda *a: pretend.stub(one=lambda: email)
Expand Down Expand Up @@ -603,7 +603,7 @@ def test_reverify_email_ratelimit_exceeded(self, monkeypatch):
)

request = pretend.stub(
POST={"reverify_email_id": pretend.stub()},
POST={"reverify_email_id": "9999"},
db=pretend.stub(
query=lambda *a: pretend.stub(
filter=lambda *a: pretend.stub(one=lambda: email)
Expand Down Expand Up @@ -645,7 +645,7 @@ def raise_no_result():
raise NoResultFound

request = pretend.stub(
POST={"reverify_email_id": pretend.stub()},
POST={"reverify_email_id": "9999"},
db=pretend.stub(
query=lambda *a: pretend.stub(
filter=lambda *a: pretend.stub(one=raise_no_result)
Expand All @@ -672,7 +672,7 @@ def test_reverify_email_already_verified(self, monkeypatch):
email = pretend.stub(verified=True, email="email_address")

request = pretend.stub(
POST={"reverify_email_id": pretend.stub()},
POST={"reverify_email_id": "9999"},
db=pretend.stub(
query=lambda *a: pretend.stub(
filter=lambda *a: pretend.stub(one=lambda: email)
Expand Down
6 changes: 3 additions & 3 deletions warehouse/manage/views/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def delete_email(self):
email = (
self.request.db.query(Email)
.filter(
Email.id == self.request.POST["delete_email_id"],
Email.id == int(self.request.POST["delete_email_id"]),
Email.user_id == self.request.user.id,
)
.one()
Expand Down Expand Up @@ -282,7 +282,7 @@ def change_primary_email(self):
self.request.db.query(Email)
.filter(
Email.user_id == self.request.user.id,
Email.id == self.request.POST["primary_email_id"],
Email.id == int(self.request.POST["primary_email_id"]),
Email.verified.is_(True),
)
.one()
Expand Down Expand Up @@ -324,7 +324,7 @@ def reverify_email(self):
email = (
self.request.db.query(Email)
.filter(
Email.id == self.request.POST["reverify_email_id"],
Email.id == int(self.request.POST["reverify_email_id"]),
Email.user_id == self.request.user.id,
)
.one()
Expand Down

0 comments on commit af0875b

Please sign in to comment.