Release: server 2.71.0 with the 2.71.0 browser artifact

internal/vault/demo.go

@@ -158,6 +158,9 @@ func (v *Vault) RemoveDemoTour() (DemoTourResult, error) {
 		}
 		if err := os.Remove(abs); err == nil {
 			result.AssetPaths = append(result.AssetPaths, filepath.ToSlash(asset.Path))
+			// The sample database ships as a folder of its own
+			// (`Reading List.base`), which has to go before the tour folder can.
+			removedDirs[filepath.Dir(abs)] = true
 		}
 	}
 	for dir := range removedDirs {

internal/vault/demo_test.go

@@ -100,3 +100,23 @@ func contains(list []string, s string) bool {
 	}
 	return false
 }
+
+func TestRemoveDemoTourLeavesNoTourFolder(t *testing.T) {
+	root := t.TempDir()
+	v, err := New(root, Options{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := v.GenerateDemoTour(); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := os.Stat(filepath.Join(root, "inbox", "demo", "Reading List.base", "data.csv")); err != nil {
+		t.Fatalf("the sample database was not written: %v", err)
+	}
+	if _, err := v.RemoveDemoTour(); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := os.Stat(filepath.Join(root, "inbox", "demo")); !os.IsNotExist(err) {
+		t.Errorf("the tour folder is still there (err %v)", err)
+	}
+}

release.json

@@ -1,4 +1,4 @@
 {
-  "version": "2.70.0",
+  "version": "2.71.0",
   "vendorHash": "sha256-ZdOHC2JldvnKSDUFnBUJrKD4F1IWfvYJBksgeDnU9cw="
 }