refactor(oauth): Change the Oauth prefix in test utils with OAuth

For consistency.

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk/src/test_utils/client.rs

@@ -53,14 +53,14 @@ impl MockClientBuilder {
     /// The client is registered with the OAuth 2.0 API.
     #[cfg(feature = "experimental-oidc")]
     pub fn registered_with_oauth(mut self, issuer: impl Into<String>) -> Self {
-        self.auth_state = AuthState::RegisteredWithOauth { issuer: issuer.into() };
+        self.auth_state = AuthState::RegisteredWithOAuth { issuer: issuer.into() };
         self
     }
 
     /// The user is already logged in with the OAuth 2.0 API.
     #[cfg(feature = "experimental-oidc")]
     pub fn logged_in_with_oauth(mut self, issuer: impl Into<String>) -> Self {
-        self.auth_state = AuthState::LoggedInWithOauth { issuer: issuer.into() };
+        self.auth_state = AuthState::LoggedInWithOAuth { issuer: issuer.into() };
         self
     }
 
@@ -102,10 +102,10 @@ enum AuthState {
     LoggedInWithMatrixAuth,
     /// The client is registered with the OAuth 2.0 API.
     #[cfg(feature = "experimental-oidc")]
-    RegisteredWithOauth { issuer: String },
+    RegisteredWithOAuth { issuer: String },
     /// The client is logged in with the OAuth 2.0 API.
     #[cfg(feature = "experimental-oidc")]
-    LoggedInWithOauth { issuer: String },
+    LoggedInWithOAuth { issuer: String },
 }
 
 impl AuthState {
@@ -118,12 +118,12 @@ impl AuthState {
                 client.matrix_auth().restore_session(mock_matrix_session()).await.unwrap();
             }
             #[cfg(feature = "experimental-oidc")]
-            AuthState::RegisteredWithOauth { issuer } => {
+            AuthState::RegisteredWithOAuth { issuer } => {
                 let issuer = url::Url::parse(&issuer).unwrap();
                 client.oauth().restore_registered_client(issuer, oauth::mock_client_id());
             }
             #[cfg(feature = "experimental-oidc")]
-            AuthState::LoggedInWithOauth { issuer } => {
+            AuthState::LoggedInWithOAuth { issuer } => {
                 client
                     .oauth()
                     .restore_session(oauth::mock_session(

crates/matrix-sdk/src/test_utils/mocks/mod.rs

@@ -147,10 +147,10 @@ impl MatrixMockServer {
         &self.server
     }
 
-    /// Get an `OauthMockServer` that uses the same mock server as this one.
+    /// Get an `OAuthMockServer` that uses the same mock server as this one.
     #[cfg(feature = "experimental-oidc")]
-    pub fn oauth(&self) -> oauth::OauthMockServer<'_> {
-        oauth::OauthMockServer::new(self)
+    pub fn oauth(&self) -> oauth::OAuthMockServer<'_> {
+        oauth::OAuthMockServer::new(self)
     }
 
     /// Mock the given endpoint.

crates/matrix-sdk/src/test_utils/mocks/oauth.rs

@@ -53,11 +53,11 @@ use super::{MatrixMock, MatrixMockServer, MockEndpoint};
 ///   mostly defers its implementations to [`wiremock::Mock`] under the hood.
 ///
 /// [`MockServer`]: wiremock::MockServer
-pub struct OauthMockServer<'a> {
+pub struct OAuthMockServer<'a> {
     server: &'a MatrixMockServer,
 }
 
-impl<'a> OauthMockServer<'a> {
+impl<'a> OAuthMockServer<'a> {
     pub(super) fn new(server: &'a MatrixMockServer) -> Self {
         Self { server }
     }
@@ -69,11 +69,11 @@ impl<'a> OauthMockServer<'a> {
 }
 
 // Specific mount endpoints.
-impl OauthMockServer<'_> {
+impl OAuthMockServer<'_> {
     /// Creates a prebuilt mock for the Matrix endpoint used to query the
     /// authorization server's metadata.
     ///
-    /// Contrary to all the other endpoints of [`OauthMockServer`], this is an
+    /// Contrary to all the other endpoints of [`OAuthMockServer`], this is an
     /// endpoint from the Matrix API, but it is only used in the context of the
     /// OAuth 2.0 API, which is why it is mocked here rather than on
     /// [`MatrixMockServer`].