From a0cf04e0660d00a0a798033458321602e05aa29d Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@apache.org>
Date: Tue, 29 May 2018 12:23:50 +0200
Subject: [PATCH] Added two more tests: one where a package contains a library
 and a binary and another where it only contains a binary.

---
 tests/testsuite/doc.rs | 70 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs
index 8d5f6fc44..ba66df524 100644
--- a/tests/testsuite/doc.rs
+++ b/tests/testsuite/doc.rs
@@ -1503,7 +1503,75 @@ fn doc_workspace_open_different_library_and_package_names() {
         .file("foo/src/lib.rs", "")
         .build();
 
-    // The order in which bar is compiled or documented is not deterministic
+    assert_that(
+        p.cargo("doc --open").env("BROWSER", "echo"),
+        execs()
+            .with_status(0)
+            .with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
+            .with_stderr_contains("[..] Opening [..][/]foo[/]target[/]doc[/]foolib[/]index.html")
+    );
+}
+
+#[test]
+fn doc_workspace_open_binary() {
+    let p = project("foo")
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["foo"]
+        "#,
+        )
+        .file(
+            "foo/Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [[bin]]
+            name = "foobin"
+            path = "src/main.rs"
+        "#,
+        )
+        .file("foo/src/main.rs", "")
+        .build();
+
+    assert_that(
+        p.cargo("doc --open").env("BROWSER", "echo"),
+        execs()
+            .with_status(0)
+            .with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
+            .with_stderr_contains("[..] Opening [..][/]foo[/]target[/]doc[/]foobin[/]index.html")
+    );
+}
+
+#[test]
+fn doc_workspace_open_binary_and_library() {
+    let p = project("foo")
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["foo"]
+        "#,
+        )
+        .file(
+            "foo/Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [lib]
+            name = "foolib"
+            [[bin]]
+            name = "foobin"
+            path = "src/main.rs"
+        "#,
+        )
+        .file("foo/src/lib.rs", "")
+        .file("foo/src/main.rs", "")
+        .build();
+
     assert_that(
         p.cargo("doc --open").env("BROWSER", "echo"),
         execs()
-- 
2.30.2