diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-11-27 09:42:37 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-11-27 09:44:24 +0000 |
| commit | cb92d2ac8a7e014eac28ddf9ad1e6500b840739f (patch) | |
| tree | 15fc284c905a9ac636fada066ed3caa933ce562f /tests | |
| parent | c002cef1e5d19946244086531f1178446fed8545 (diff) | |
feat(account): move login/out cmds to account
move login, logout export-keys commands to sub commands under account
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ngit_login.rs | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tests/ngit_login.rs b/tests/ngit_login.rs index 0a8bc19..3d74c4a 100644 --- a/tests/ngit_login.rs +++ b/tests/ngit_login.rs | |||
| @@ -38,7 +38,7 @@ fn first_time_login_choices_succeeds_with_nsec(p: &mut CliTester, nsec: &str) -> | |||
| 38 | 38 | ||
| 39 | fn standard_first_time_login_with_nsec() -> Result<CliTester> { | 39 | fn standard_first_time_login_with_nsec() -> Result<CliTester> { |
| 40 | let test_repo = GitTestRepo::default(); | 40 | let test_repo = GitTestRepo::default(); |
| 41 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login", "--offline"]); | 41 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]); |
| 42 | 42 | ||
| 43 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 43 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 44 | 44 | ||
| @@ -77,7 +77,7 @@ mod with_relays { | |||
| 77 | 77 | ||
| 78 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 78 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 79 | let test_repo = GitTestRepo::default(); | 79 | let test_repo = GitTestRepo::default(); |
| 80 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login"]); | 80 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]); |
| 81 | 81 | ||
| 82 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 82 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 83 | 83 | ||
| @@ -108,7 +108,7 @@ mod with_relays { | |||
| 108 | 108 | ||
| 109 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 109 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 110 | let test_repo = GitTestRepo::default(); | 110 | let test_repo = GitTestRepo::default(); |
| 111 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login"]); | 111 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]); |
| 112 | 112 | ||
| 113 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 113 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 114 | 114 | ||
| @@ -416,7 +416,7 @@ mod with_relays { | |||
| 416 | let test_repo = GitTestRepo::default(); | 416 | let test_repo = GitTestRepo::default(); |
| 417 | let mut p = CliTester::new_from_dir( | 417 | let mut p = CliTester::new_from_dir( |
| 418 | &test_repo.dir, | 418 | &test_repo.dir, |
| 419 | ["login", "--nsec", TEST_KEY_1_NSEC], | 419 | ["account", "login", "--nsec", TEST_KEY_1_NSEC], |
| 420 | ); | 420 | ); |
| 421 | 421 | ||
| 422 | p.expect("saved login details to local git config. you are only logged in to this local repository.\r\n")?; | 422 | p.expect("saved login details to local git config. you are only logged in to this local repository.\r\n")?; |
| @@ -458,7 +458,7 @@ mod with_relays { | |||
| 458 | 458 | ||
| 459 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 459 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 460 | let test_repo = GitTestRepo::default(); | 460 | let test_repo = GitTestRepo::default(); |
| 461 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login"]); | 461 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]); |
| 462 | 462 | ||
| 463 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 463 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 464 | 464 | ||
| @@ -512,7 +512,7 @@ mod with_relays { | |||
| 512 | 512 | ||
| 513 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 513 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 514 | let test_repo = GitTestRepo::default(); | 514 | let test_repo = GitTestRepo::default(); |
| 515 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login"]); | 515 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]); |
| 516 | 516 | ||
| 517 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 517 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 518 | 518 | ||
| @@ -553,7 +553,7 @@ mod with_relays { | |||
| 553 | 553 | ||
| 554 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 554 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 555 | let test_repo = GitTestRepo::default(); | 555 | let test_repo = GitTestRepo::default(); |
| 556 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login"]); | 556 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]); |
| 557 | 557 | ||
| 558 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; | 558 | first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?; |
| 559 | 559 | ||
| @@ -628,7 +628,7 @@ mod with_offline_flag { | |||
| 628 | #[test] | 628 | #[test] |
| 629 | fn succeeds_with_text_logged_in_as_npub() -> Result<()> { | 629 | fn succeeds_with_text_logged_in_as_npub() -> Result<()> { |
| 630 | let test_repo = GitTestRepo::default(); | 630 | let test_repo = GitTestRepo::default(); |
| 631 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login", "--offline"]); | 631 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]); |
| 632 | 632 | ||
| 633 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; | 633 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; |
| 634 | 634 | ||
| @@ -643,7 +643,7 @@ mod with_offline_flag { | |||
| 643 | #[test] | 643 | #[test] |
| 644 | fn succeeds_with_hex_secret_key_in_place_of_nsec() -> Result<()> { | 644 | fn succeeds_with_hex_secret_key_in_place_of_nsec() -> Result<()> { |
| 645 | let test_repo = GitTestRepo::default(); | 645 | let test_repo = GitTestRepo::default(); |
| 646 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login", "--offline"]); | 646 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]); |
| 647 | 647 | ||
| 648 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; | 648 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; |
| 649 | 649 | ||
| @@ -661,7 +661,8 @@ mod with_offline_flag { | |||
| 661 | #[test] | 661 | #[test] |
| 662 | fn prompts_for_nsec_until_valid() -> Result<()> { | 662 | fn prompts_for_nsec_until_valid() -> Result<()> { |
| 663 | let test_repo = GitTestRepo::default(); | 663 | let test_repo = GitTestRepo::default(); |
| 664 | let mut p = CliTester::new_from_dir(&test_repo.dir, ["login", "--offline"]); | 664 | let mut p = |
| 665 | CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]); | ||
| 665 | 666 | ||
| 666 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; | 667 | show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?; |
| 667 | 668 | ||
| @@ -698,7 +699,7 @@ mod with_offline_flag { | |||
| 698 | let test_repo = GitTestRepo::default(); | 699 | let test_repo = GitTestRepo::default(); |
| 699 | let mut p = CliTester::new_from_dir( | 700 | let mut p = CliTester::new_from_dir( |
| 700 | &test_repo.dir, | 701 | &test_repo.dir, |
| 701 | ["login", "--offline", "--nsec", TEST_KEY_1_NSEC], | 702 | ["account", "login", "--offline", "--nsec", TEST_KEY_1_NSEC], |
| 702 | ); | 703 | ); |
| 703 | 704 | ||
| 704 | p.expect("saved login details to local git config. you are only logged in to this local repository.\r\n")?; | 705 | p.expect("saved login details to local git config. you are only logged in to this local repository.\r\n")?; |
| @@ -713,7 +714,7 @@ mod with_offline_flag { | |||
| 713 | let test_repo = GitTestRepo::default(); | 714 | let test_repo = GitTestRepo::default(); |
| 714 | let mut p = CliTester::new_from_dir( | 715 | let mut p = CliTester::new_from_dir( |
| 715 | &test_repo.dir, | 716 | &test_repo.dir, |
| 716 | ["login", "--offline", "--nsec", TEST_INVALID_NSEC], | 717 | ["account", "login", "--offline", "--nsec", TEST_INVALID_NSEC], |
| 717 | ); | 718 | ); |
| 718 | 719 | ||
| 719 | p.expect_end_with( | 720 | p.expect_end_with( |