dblsaiko/pijul - Change 6FRPUHWKBAWIYN6B6YDFQG2SFWZ6MBBYOYXFUN6DRZ4HPDSKFANQC

Fix identity tests

There is an issue when running multiple tests at once, so the testing code may need a refactor to support async. For now, the flag --jobs 1 prevents this from happening.

Created by finchie on September 25, 2022

6FRPUHWKBAWIYN6B6YDFQG2SFWZ6MBBYOYXFUN6DRZ4HPDSKFANQC

Dependencies

In channels

main

Change contents

Insertion in pijul/tests/identity.rs at line 24 [2.55]
[2.599]
[2.599]
```
        None,
```

Insertion in pijul/tests/identity.rs at line 66 [2.55]

[2.1724]

        Some(Interaction::new(
            prompt::SELECT_KEY,
            InteractionType::Input(default::SSH.to_string()),
        )),

Insertion in pijul/tests/identity.rs at line 96 [2.55]
[2.2341]
[2.2341]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 123 [2.55]
[2.2959]
[2.2959]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 144 [2.55]
[2.3363]
[2.3363]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 165 [2.55]
[2.3771]
[2.3771]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 198 [2.55]
[2.4646]
[2.4646]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 210 [2.55]
[2.4850]
[2.4850]
```
        None,
```

Insertion in pijul/tests/identity.rs at line 270 [2.55]

[2.6741]

        Some(Interaction::new(
            prompt::SELECT_KEY,
            InteractionType::Input(default::SSH.to_string()),
        )),

Insertion in pijul/tests/identity.rs at line 289 [2.55]
[2.7036]
[2.7036]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 310 [2.55]
[2.7406]
[2.7406]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 332 [2.55]
[2.7781]
[2.7781]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 353 [2.55]
[2.8294]
[2.8294]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 375 [2.55]
[2.8671]
[2.8671]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 396 [2.55]
[2.9184]
[2.9184]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 418 [2.55]
[2.9565]
[2.9565]
```
        None,
```
Insertion in pijul/tests/identity.rs at line 445 [2.55]
[2.10333]
[2.10333]
```
        None,
```
Replacement in pijul/tests/identity.rs at line 459 [2.55]
B:BD[2.10567] → [2.10567:10590]
```
        "new_minimal",
```
[2.10567]
[2.10590]
```
        "remove",
```
Insertion in pijul/tests/identity.rs at line 467 [2.55]
[2.10701]
[2.10701]
```
        None,
```

Insertion in pijul/tests/common/identity.rs at line 20 [2.17837]

[2.18395]

    pub const SSH: &str = ""; // Just confirm the first item in SSH option list

Replacement in pijul/tests/common/identity.rs at line 25 [2.17837]
B:BD[2.18469] → [2.18469:18517]
```
    pub const FULL_NAME: &str = "Display name";
```
[2.18469]
[2.18517]
```
    pub const DISPLAY_NAME: &str = "Display name";
```
Replacement in pijul/tests/common/identity.rs at line 30 [2.17837]
B:BD[2.18729] → [2.18729:18783]
```
    pub const PASSWORD: &str = "Secret key password";
```
[2.18729]
[2.18783]
```
    pub const PASSWORD: &str = "New password";
```
Insertion in pijul/tests/common/identity.rs at line 32 [2.17837]
[2.18843]
[2.18843]
```
    pub const SELECT_KEY: &str = "Select key";
```

Insertion in pijul/tests/common/identity.rs at line 35 [2.17837]

[2.18866]

        pub const SSH: &str = "Do you want to change the default SSH key?";
        pub const ENCRYPTION: &str = "Do you want to change the encryption?";

Deletion in pijul/tests/common/identity.rs at line 39 [2.17837]
B:BD[2.19017] → [2.19017:19095]
```
        pub const ENCRYPTION: &str = "Do you want to change the encryption?";
```
Replacement in pijul/tests/common/identity.rs at line 56 [2.17837]
B:BD[2.19321] → [2.19321:19356]
```
    pub full_name: Option<String>,
```
[2.19321]
[2.19356]
```
    pub display_name: Option<String>,
```
Insertion in pijul/tests/common/identity.rs at line 62 [2.17837]
[2.19541]
[2.19541]
```
    pub key_path: Option<Interaction>,
```
Insertion in pijul/tests/common/identity.rs at line 76 [2.17837]
[2.19890]
[2.19890]
```
        key_path: Option<Interaction>,
```
Replacement in pijul/tests/common/identity.rs at line 82 [2.17837]
B:BD[2.20070] → [2.20070:20093]
```
            full_name,
```
[2.20070]
[2.20093]
```
            display_name: full_name,
```
Insertion in pijul/tests/common/identity.rs at line 88 [2.17837]
[2.20201]
[2.20201]
```
            key_path,
```
Replacement in pijul/tests/common/identity.rs at line 139 [2.17837]
B:BD[2.21740] → [2.21740:21785]
```
        self.full_name.as_ref().map_or_else(
```
[2.21740]
[2.21785]
```
        self.display_name.as_ref().map_or_else(
```

Replacement in pijul/tests/common/identity.rs at line 148 [2.17837]

B:BD[2.22075] → [2.22075:22144]

                    toml_data.get("name").unwrap().as_str().unwrap()

[2.22075]

[2.22144]

                    toml_data.get("display_name").unwrap().as_str().unwrap()

Replacement in pijul/tests/common/identity.rs at line 174 [2.17837]

B:BD[2.22969] → [2.22969:23039]

                    toml_data.get("login").unwrap().as_str().unwrap()

[2.22969]

[2.23039]

                    toml_data.get("username").unwrap().as_str().unwrap()

Replacement in pijul/tests/common/identity.rs at line 251 [2.17837]
B:BD[2.25428] → [2.25428:25480]
```
        pijul_cmd.arg("--no-prompt").arg("--name");
```
[2.25428]
[2.25480]
```
        pijul_cmd.arg("--no-prompt");
```

Replacement in pijul/tests/common/identity.rs at line 258 [2.17837]

B:BD[2.25657] → [2.25657:25815]

                pijul_cmd
                    .arg(&old_name)
                    .arg("--new-name")
                    .arg(self.id_name.get_input(valid));

[2.25657]

[2.25815]

                pijul_cmd.arg(&old_name);
                let new_name = self.id_name.get_input(valid);
                if old_name != &new_name {
                    pijul_cmd.arg("--new-name").arg(new_name);
                }

Replacement in pijul/tests/common/identity.rs at line 270 [2.17837]

B:BD[2.25939] → [2.25939:25997]

        if let Some(full_name) = self.full_name.clone() {

[2.25939]

[2.25997]

        if let Some(full_name) = self.display_name.clone() {

Insertion in pijul/tests/common/identity.rs at line 303 [2.17837]

[2.27176]

        // Interatction tree
        // ├── Identity name
        // ├── Display name
        // ├── Email
        // ├── Encryption
        // │   ├── Password
        // │   └── Confirm
        // ├── Expiry
        // │   └── Date
        // └── Link to remote
        //     ├── Username
        //     ├── Origin
        //     └── Default SSH key
        //         └── Key path

Insertion in pijul/tests/common/identity.rs at line 318 [2.17837]
[2.27230]
[2.27230]
```
        // Interaction: ID name
```

Replacement in pijul/tests/common/identity.rs at line 322 [2.17837]

B:BD[2.27277] → [2.27277:27418]

        if let Some(full_name) = self.full_name.clone() {
            Interaction::new(prompt::FULL_NAME, InteractionType::Input(full_name))

[2.27277]

[2.27418]

        // Interaction: Display name
        if let Some(display_name) = self.display_name.clone() {
            Interaction::new(prompt::DISPLAY_NAME, InteractionType::Input(display_name))

Replacement in pijul/tests/common/identity.rs at line 327 [2.17837]

B:BD[2.27477] → [2.27477:27564]

            Interaction::new(prompt::FULL_NAME, InteractionType::Input(String::new()))

[2.27477]

[2.27564]

            Interaction::new(prompt::DISPLAY_NAME, InteractionType::Input(String::new()))

Insertion in pijul/tests/common/identity.rs at line 331 [2.17837]
[2.27617]
[2.27617]
```
        // Interaction: Email
```

Insertion in pijul/tests/common/identity.rs at line 339 [2.17837]

[2.27837]


        // Interaction: Encryption
        Interaction::new(
            format!(
                "{} (Current status: not encrypted)",
                prompt::confirm::ENCRYPTION
            ),
            InteractionType::Confirm(self.password.is_some()),
        )
        .interact(&mut session)?;
        if let Some(password) = self.password.clone() {
            password.interact(&mut session)?;
        }

Insertion in pijul/tests/common/identity.rs at line 353 [2.17837]
[2.27838]
[2.27838]
```
        // Interaction: Expiry
```

Replacement in pijul/tests/common/identity.rs at line 363 [2.17837]

B:BD[2.28152] → [2.28152:28225]

        let remote_data = self.login.is_some() || self.origin.is_some();

[2.28152]

[2.28225]

        // Interaction: Link remote
        let remote_data = self.login.is_some() || self.origin.is_some() || self.key_path.is_some();

Deletion in pijul/tests/common/identity.rs at line 385 [2.17837]
B:BD[2.29027] → [2.29027:29037]
```
        }
```

Replacement in pijul/tests/common/identity.rs at line 386 [2.17837]

B:BD[2.29038] → [2.29038:29407]

        Interaction::new(
            format!(
                "{} (Current status: not encrypted)",
                prompt::confirm::ENCRYPTION
            ),
            InteractionType::Confirm(self.password.is_some()),
        )
        .interact(&mut session)?;
        if let Some(password) = self.password.clone() {
            password.interact(&mut session)?;

[2.29038]

[2.29407]

            Interaction::new(
                prompt::confirm::SSH,
                InteractionType::Confirm(self.key_path.is_some()),
            )
            .interact(&mut session)?;
            if let Some(key_path) = self.key_path.clone() {
                key_path.interact(&mut session)?;
            }

Replacement in pijul/src/identity/repair.rs at line 292 [5.56]
B:BD[4.1595] → [4.1595:1635]
```
            author.user_name = identity
```
[4.1595]
[5.14417]
```
            author.username = identity
```

Replacement in pijul/src/identity/repair.rs at line 294 [5.56]

B:BD[5.14443] → [4.1636:1718]

                .map_or_else(String::new, |x| x.config.author.user_name.clone());

[5.14443]

[5.14646]

                .map_or_else(String::new, |x| x.config.author.username.clone());

Replacement in pijul/src/identity/mod.rs at line 286 [5.15627]

B:BD[5.19976] → [4.8084:8153]

        let has_username = !self.config.author.user_name.is_empty();

[5.19976]

[4.8153]

        let has_username = !self.config.author.username.is_empty();

Replacement in pijul/src/identity/mod.rs at line 292 [5.15627]

B:BD[5.20227] → [4.8218:8290]

                self.config.author.user_name, self.config.author.origin

[5.20227]

[5.20285]

                self.config.author.username, self.config.author.origin

Replacement in pijul/src/identity/mod.rs at line 295 [5.15627]

B:BD[5.20333] → [4.8291:8357]

            Some(format!(" [@{}]", self.config.author.user_name))

[5.20333]

[5.20390]

            Some(format!(" [@{}]", self.config.author.username))

Deletion in pijul/src/identity/create.rs at line 86 [5.28175]

B:BD[4.9519] → [4.9519:10005]

                "Would you like to change the default SSH key? (Current key: {})",
                if let Some(path) = &self.config.key_path {
                    format!("{path:#?}")
                } else {
                    String::from("none")
                }
            ))
            .default(false)
            .interact()?
        {
            new_identity.prompt_ssh().await?;
        }
        if Confirm::with_theme(config.as_ref())
            .with_prompt(&format!(

Insertion in pijul/src/identity/create.rs at line 109 [5.28175]

[4.10782]

        } else {
            // The user wants an 'offline' identity, so make sure not to store login info
            new_identity.config.key_path = None;
            new_identity.config.author.username = String::new();
            new_identity.config.author.origin = String::new();

Replacement in pijul/src/identity/create.rs at line 161 [5.28175]

B:BD[4.12545] → [4.12545:12619]

        self.config.author.user_name = Input::with_theme(config.as_ref())

[4.12545]

[4.12619]

        self.config.author.username = Input::with_theme(config.as_ref())

Replacement in pijul/src/identity/create.rs at line 164 [5.28175]

B:BD[4.12704] → [4.12704:12766]

            .with_initial_text(&self.config.author.user_name)

[4.12704]

[4.12766]

            .with_initial_text(&self.config.author.username)

Insertion in pijul/src/identity/create.rs at line 175 [5.28175]

[4.13093]

        if Confirm::with_theme(config.as_ref())
            .with_prompt(&format!(
                "Do you want to change the default SSH key? (Current key: {})",
                if let Some(path) = &self.config.key_path {
                    format!("{path:#?}")
                } else {
                    String::from("none")
                }
            ))
            .default(false)
            .interact()
            .unwrap()
        {
            self.prompt_ssh().await?;
        }

Replacement in pijul/src/identity/create.rs at line 285 [5.28175]

B:BD[5.37098] → [4.13744:13814]

            &self.config.author.user_name, &self.config.author.origin

[5.37098]

[5.37154]

            &self.config.author.username, &self.config.author.origin

Replacement in pijul/src/config.rs at line 22 [7.89866]

B:BD[6.182] → [4.14271:14349]

    // Older versions called this 'name', but 'user_name' is more descriptive

[6.182]

[4.14349]

    // Older versions called this 'name', but 'username' is more descriptive

Replacement in pijul/src/config.rs at line 24 [7.89866]
B:BD[4.14429] → [4.14429:14456]
```
    pub user_name: String,
```
[4.14429]
[4.14456]
```
    pub username: String,
```
Replacement in pijul/src/config.rs at line 39 [7.89866]
B:BD[4.14987] → [4.14987:15025]
```
            user_name: String::new(),
```
[4.14987]
[4.15025]
```
            username: String::new(),
```

Replacement in pijul/src/commands/log.rs at line 396 [7.134376]

B:BD[4.15914] → [4.15914:15987]

                                    e.insert(id.config.author.user_name)

[4.15914]

[4.15987]

                                    e.insert(id.config.author.username)

Replacement in pijul/src/commands/log.rs at line 402 [7.134376]

B:BD[4.16291] → [4.16291:16362]

                                            id.config.author.user_name

[4.16291]

[4.16362]

                                            id.config.author.username

Replacement in pijul/src/commands/log.rs at line 408 [7.134376]

B:BD[4.16599] → [4.16599:16671]

                                            id.config.author.user_name,

[4.16599]

[4.16671]

                                            id.config.author.username,

Replacement in pijul/src/commands/identity.rs at line 74 [5.40825]

B:BD[5.42808] → [5.42808:42895]

            .args(&["display-name", "email", "expiry", "username", "remote", "name"]),

[5.42773]

[5.42895]

            .args(&["display-name", "email", "expiry", "username", "remote", "name", "password"]),

Replacement in pijul/src/commands/identity.rs at line 96 [5.40825]

B:BD[5.43775] → [5.43775:43861]

        #[clap(long = "name", value_parser = name_does_not_exist, display_order = 3)]

[5.43775]

[5.43861]

        #[clap(value_parser = name_does_not_exist)]

Replacement in pijul/src/commands/identity.rs at line 110 [5.40825]

B:BD[5.44349] → [5.44349:44440]

            .args(&["display-name", "email", "new-name", "expiry", "username", "remote"]),

[5.44314]

[5.44440]

            .args(&["display-name", "email", "new-name", "expiry", "username", "remote", "password"]),

Replacement in pijul/src/commands/identity.rs at line 114 [5.40825]

B:BD[5.44519] → [3.0:78]

        #[clap(group("name"), value_parser = name_exists, display_order = 2)]

[5.44519]

[5.44612]

        #[clap(group("name"), value_parser = name_exists)]

Replacement in pijul/src/commands/identity.rs at line 208 [5.40825]

B:BD[5.47648] → [5.47648:47700]

                .with_prompt("Secret key password")

[5.47648]

[5.47700]

                .with_prompt("New password")

Replacement in pijul/src/commands/identity.rs at line 223 [5.40825]

B:BD[4.17085] → [4.17085:17162]

                user_name: login.unwrap_or(default.config.author.user_name),

[4.17085]

[4.17162]

                username: login.unwrap_or(default.config.author.username),

Replacement in pijul/src/commands/identity.rs at line 305 [5.40825]

B:BD[5.51088] → [4.18110:18194]

                    let username = if identity.config.author.user_name.is_empty() {

[5.51088]

[4.18194]

                    let username = if identity.config.author.username.is_empty() {

Replacement in pijul/src/commands/identity.rs at line 308 [5.40825]

B:BD[5.51243] → [4.18235:18293]

                        &identity.config.author.user_name

[5.51243]

[5.51291]

                        &identity.config.author.username

Fix identity tests

Dependencies

In channels

Change contents

Insertion in pijul/tests/identity.rs at line 24 [2.55]

Insertion in pijul/tests/identity.rs at line 66 [2.55]

Insertion in pijul/tests/identity.rs at line 96 [2.55]

Insertion in pijul/tests/identity.rs at line 123 [2.55]

Insertion in pijul/tests/identity.rs at line 144 [2.55]

Insertion in pijul/tests/identity.rs at line 165 [2.55]

Insertion in pijul/tests/identity.rs at line 198 [2.55]

Insertion in pijul/tests/identity.rs at line 210 [2.55]

Insertion in pijul/tests/identity.rs at line 270 [2.55]

Insertion in pijul/tests/identity.rs at line 289 [2.55]

Insertion in pijul/tests/identity.rs at line 310 [2.55]

Insertion in pijul/tests/identity.rs at line 332 [2.55]

Insertion in pijul/tests/identity.rs at line 353 [2.55]

Insertion in pijul/tests/identity.rs at line 375 [2.55]

Insertion in pijul/tests/identity.rs at line 396 [2.55]

Insertion in pijul/tests/identity.rs at line 418 [2.55]

Insertion in pijul/tests/identity.rs at line 445 [2.55]

Replacement in pijul/tests/identity.rs at line 459 [2.55]

Insertion in pijul/tests/identity.rs at line 467 [2.55]

Insertion in pijul/tests/common/identity.rs at line 20 [2.17837]

Replacement in pijul/tests/common/identity.rs at line 25 [2.17837]

Replacement in pijul/tests/common/identity.rs at line 30 [2.17837]

Insertion in pijul/tests/common/identity.rs at line 32 [2.17837]

Insertion in pijul/tests/common/identity.rs at line 35 [2.17837]

Deletion in pijul/tests/common/identity.rs at line 39 [2.17837]

Replacement in pijul/tests/common/identity.rs at line 56 [2.17837]

Insertion in pijul/tests/common/identity.rs at line 62 [2.17837]

Insertion in pijul/tests/common/identity.rs at line 76 [2.17837]

Replacement in pijul/tests/common/identity.rs at line 82 [2.17837]

Insertion in pijul/tests/common/identity.rs at line 88 [2.17837]

Replacement in pijul/tests/common/identity.rs at line 139 [2.17837]