Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make 3PID binding tests use /account/3pid/bind ala MSC2290 #703

Merged
merged 6 commits into from
Sep 23, 2019

Conversation

anoadragon453
Copy link
Member

Synapse PR: matrix-org/synapse#6043

Changes the 3PID binding tests to use the new unstable /account/3pid/bind API endpoint, defined in MSC2290.

@anoadragon453
Copy link
Member Author

The CI here is going to fail as it's using Synapse develop not Synapse anoa/msc2290 :/

@anoadragon453
Copy link
Member Author

@richvdh There are some merge conflicts introduced here due to add_email_to_user replacing the /requestToken calls here. Can you sort out what should be done?

@richvdh
Copy link
Member

richvdh commented Sep 18, 2019

done

@richvdh
Copy link
Member

richvdh commented Sep 18, 2019

@anoadragon453 I think I now need you to rreview this one, ironically...

address. False by default.

=back

=cut

sub add_email_for_user {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If bind_email_for_user is using the new bind API, should this method use the new add API?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess... we can do that later though?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True

@richvdh
Copy link
Member

richvdh commented Sep 19, 2019

this is now ready to merge, pending matrix-org/synapse#6043.

@richvdh richvdh removed the request for review from a team September 19, 2019 13:53
@richvdh richvdh merged commit 626ce88 into develop Sep 23, 2019
@richvdh richvdh deleted the anoa/msc2290 branch September 23, 2019 16:46
anoadragon453 added a commit that referenced this pull request Mar 18, 2020
…ase-v1.4.0

* origin/release-v1.4.0: (36 commits)
  Improve logging for a failing test (#709)
  Make 3PID binding tests use /account/3pid/bind ala MSC2290 (#703)
  Use unstable prefix for 3PID unbind API
  Add support for handling email validation challenges (#707)
  do requestToken before adding a 3pid (#706)
  Configure synapse to use the test mail server (#705)
  Implement a mail server to help with 3pid testing (#704)
  federated_rooms_fixture (#701)
  Use Sytest develop for Dendrite's master branch (#700)
  Don't assume atomicity
  Fix flakiness due to create_room_synced (#702)
  Don't require an avatar_url
  Replace HOMESERVER_INFO incantations (#699)
  add some logging for flaky sync test (#698)
  Fix problems when using hash
  Accept access_token instead of id_access_token on the IS, accept Authorization header (#697)
  Use hash and handle variable sized final chunk
  Have the in-built identity server support v2 (#689)
  Add tests for 3PID /unbind API (#691)
  Fix typo
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants