migration reorg basically done
This commit is contained in:
@@ -135,19 +135,14 @@ pub async fn mock_login_failure(server: &MockServer) {
|
||||
|
||||
/// Mock a whoami response
|
||||
#[allow(dead_code)]
|
||||
pub async fn mock_whoami_success(server: &MockServer, username: &str, email: &str) {
|
||||
pub async fn mock_whoami_success(server: &MockServer, username: &str, display_name: &str) {
|
||||
Mock::given(method("GET"))
|
||||
.and(path("/auth/whoami"))
|
||||
.and(path("/auth/me"))
|
||||
.respond_with(ResponseTemplate::new(200).set_body_json(json!({
|
||||
"data": {
|
||||
"id": 1,
|
||||
"name": "Test User",
|
||||
"username": username,
|
||||
"email": email,
|
||||
"identity_type": "user",
|
||||
"enabled": true,
|
||||
"created": "2024-01-01T00:00:00Z",
|
||||
"updated": "2024-01-01T00:00:00Z"
|
||||
"login": username,
|
||||
"display_name": display_name
|
||||
}
|
||||
})))
|
||||
.mount(server)
|
||||
|
||||
@@ -75,7 +75,7 @@ async fn test_whoami_authenticated() {
|
||||
fixture.write_authenticated_config("valid_token", "refresh_token");
|
||||
|
||||
// Mock whoami endpoint
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "test@example.com").await;
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "Test User").await;
|
||||
|
||||
let mut cmd = Command::cargo_bin("attune").unwrap();
|
||||
cmd.env("XDG_CONFIG_HOME", fixture.config_dir_path())
|
||||
@@ -88,7 +88,7 @@ async fn test_whoami_authenticated() {
|
||||
cmd.assert()
|
||||
.success()
|
||||
.stdout(predicate::str::contains("testuser"))
|
||||
.stdout(predicate::str::contains("test@example.com"));
|
||||
.stdout(predicate::str::contains("Test User"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
@@ -97,7 +97,7 @@ async fn test_whoami_unauthenticated() {
|
||||
fixture.write_default_config();
|
||||
|
||||
// Mock unauthorized response
|
||||
mock_unauthorized(&fixture.mock_server, "/auth/whoami").await;
|
||||
mock_unauthorized(&fixture.mock_server, "/auth/me").await;
|
||||
|
||||
let mut cmd = Command::cargo_bin("attune").unwrap();
|
||||
cmd.env("XDG_CONFIG_HOME", fixture.config_dir_path())
|
||||
@@ -185,7 +185,7 @@ async fn test_whoami_json_output() {
|
||||
fixture.write_authenticated_config("valid_token", "refresh_token");
|
||||
|
||||
// Mock whoami endpoint
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "test@example.com").await;
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "Test User").await;
|
||||
|
||||
let mut cmd = Command::cargo_bin("attune").unwrap();
|
||||
cmd.env("XDG_CONFIG_HOME", fixture.config_dir_path())
|
||||
@@ -198,7 +198,7 @@ async fn test_whoami_json_output() {
|
||||
|
||||
cmd.assert()
|
||||
.success()
|
||||
.stdout(predicate::str::contains(r#""username":"#))
|
||||
.stdout(predicate::str::contains(r#""login":"#))
|
||||
.stdout(predicate::str::contains("testuser"));
|
||||
}
|
||||
|
||||
@@ -208,7 +208,7 @@ async fn test_whoami_yaml_output() {
|
||||
fixture.write_authenticated_config("valid_token", "refresh_token");
|
||||
|
||||
// Mock whoami endpoint
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "test@example.com").await;
|
||||
mock_whoami_success(&fixture.mock_server, "testuser", "Test User").await;
|
||||
|
||||
let mut cmd = Command::cargo_bin("attune").unwrap();
|
||||
cmd.env("XDG_CONFIG_HOME", fixture.config_dir_path())
|
||||
@@ -221,6 +221,6 @@ async fn test_whoami_yaml_output() {
|
||||
|
||||
cmd.assert()
|
||||
.success()
|
||||
.stdout(predicate::str::contains("username:"))
|
||||
.stdout(predicate::str::contains("login:"))
|
||||
.stdout(predicate::str::contains("testuser"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user