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.

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

fix(cli): init --force skips confirmation prompts #2057

Merged
merged 3 commits into from
Apr 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions guide/src/cli/init.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ Create a `.gitignore` file configured to ignore the `book` directory created whe
If not supplied, an interactive prompt will ask whether it should be created.

[building]: build.md

#### --force

Skip the prompts to create a `.gitignore` and for the title for the book.
4 changes: 3 additions & 1 deletion src/cmd/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
"git" => builder.create_gitignore(true),
_ => builder.create_gitignore(false),
};
} else {
} else if !args.get_flag("force") {
println!("\nDo you want a .gitignore to be created? (y/n)");
if confirm() {
builder.create_gitignore(true);
Expand All @@ -65,6 +65,8 @@ pub fn execute(args: &ArgMatches) -> Result<()> {

config.book.title = if args.contains_id("title") {
args.get_one::<String>("title").map(String::from)
} else if args.get_flag("force") {
None
} else {
request_book_title()
};
Expand Down
24 changes: 24 additions & 0 deletions tests/cli/init.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
use crate::cli::cmd::mdbook_cmd;
use crate::dummy_book::DummyBook;

use mdbook::config::Config;

/// Run `mdbook init` with `--force` to skip the confirmation prompts
#[test]
fn base_mdbook_init_can_skip_confirmation_prompts() {
let temp = DummyBook::new().build().unwrap();

// doesn't exist before
assert!(!temp.path().join("book").exists());

let mut cmd = mdbook_cmd();
cmd.args(["init", "--force"]).current_dir(temp.path());
cmd.assert()
.success()
.stdout(predicates::str::contains("\nAll done, no errors...\n"));

let config = Config::from_disk(temp.path().join("book.toml")).unwrap();
assert_eq!(config.book.title, None);

assert!(!temp.path().join(".gitignore").exists());
}
1 change: 1 addition & 0 deletions tests/cli/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
mod build;
mod cmd;
mod init;
mod test;