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.

Sign up for GitHub

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

Switch fxa_client from using mockiato to using mockall #5890

Closed
wants to merge 21 commits into from
Closed

Switch fxa_client from using mockiato to using mockall #5890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ed00b58
edit device.rs file and change every use of mocking the FxAClient in it
nox1134 Oct 23, 2023
b1183bb
Merge branch 'mozilla:main' into issue-5368
nox1134 Oct 23, 2023
5e0e251
Merge branch 'mozilla:main' into issue-5368
nox1134 Oct 27, 2023
ea6cf34
edit mod.rs, oauth.rs, attached_client.rs, push.rs, profile.rs files
nox1134 Oct 27, 2023
7b01839
make minor changes in device.rs
nox1134 Oct 27, 2023
18e6361
import always and eq function
nox1134 Oct 30, 2023
9e5dfd2
Merge branch 'main' into issue-5368
nox1134 Oct 30, 2023
5bbec56
fix the errors
nox1134 Oct 30, 2023
13957c2
fix lifetime name error
nox1134 Oct 30, 2023
5db7dc8
minor changes
nox1134 Oct 30, 2023
83b1b5f
minor changes pt.2
nox1134 Oct 30, 2023
dd43a44
minor changes pt.3()hopefully final)
nox1134 Oct 30, 2023
a42bc3d
minor changes pt.4
nox1134 Oct 30, 2023
aaaac3f
minor changes pt.5
nox1134 Oct 30, 2023
a2dc6ec
minor changes pt.6
nox1134 Oct 30, 2023
9841e1f
minor changes pt.7
nox1134 Oct 30, 2023
5b5a518
minor changes pt.8
nox1134 Oct 31, 2023
d93f5b4
Merge branch 'main' into issue-5368
nox1134 Oct 31, 2023
bba67ee
minor changes pt.9(fix moving non-Copy variable into a closure)
nox1134 Oct 31, 2023
88809a8
minor changes pt.10
nox1134 Oct 31, 2023
072f525
minor changes pt.11
nox1134 Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,660 changes: 765 additions & 895 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion components/fxa-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ uniffi = { version = "0.24.1", features = ["build"] }

[dev-dependencies]
viaduct-reqwest = { path = "../support/viaduct-reqwest" }
mockiato = "0.9"
mockall = "0.11"
mockito = "0.31"

[features]
Expand Down
3 changes: 1 addition & 2 deletions components/fxa-client/src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
use error_support::handle_error;
use serde::{Deserialize, Serialize};
use sync15::DeviceType;

use crate::{ApiResult, DevicePushSubscription, Error, FirefoxAccount};

impl FirefoxAccount {
/// Create a new device record for this application.
///
Expand All @@ -45,6 +43,7 @@ impl FirefoxAccount {
///
/// - Device registration is only available to applications that have been
/// granted the `https://identity.mozilla.com/apps/oldsync` scope.

#[handle_error(Error)]
pub fn initialize_device(
&self,
Expand Down
Loading