New integration test approach

.vscode/settings.json

@@ -1,8 +1,11 @@
 {
-    "editor.formatOnSave": true,
-    "rust-analyzer.checkOnSave.allFeatures": true,
-    "rust-analyzer.cargo.allFeatures": true,
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-    "rust-analyzer.checkOnSave.command": "clippy",
+  "editor.formatOnSave": true,
+  "rust-analyzer.checkOnSave.allFeatures": true,
+  "rust-analyzer.cargo.allFeatures": true,
+  // We have some snapshots that have trailing whitespace. `rustfmt` does this
+  // for rust files. (We could add something to pre-commit for other files if we
+  // wanted...)
+  "files.trimTrailingWhitespace": false,
+  "files.insertFinalNewline": true,
+  "rust-analyzer.checkOnSave.command": "clippy"
 }

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to insta and cargo-insta are documented here.
 
 ## 1.40.0
 
+- Inline snapshots now use with the required number of `#` to escape the
+  snapshot value, rather than always using `###`. If there are no existing `#`
+  characters in the snapshot value, this will only be a single `#`. This allows
+  snapshotting values which themselves contain `###`.
+
 - No longer suggest running `cargo insta` message when running `cargo insta test --check`.  #515
 
 - Print a clearer error message when accepting a snapshot that was removed.  #516

Makefile

@@ -15,10 +15,7 @@ cargotest:
 	@cargo test -p insta --all-features
 	@cargo test -p insta --no-default-features
 	@cargo test -p insta --features redactions -- --test-threads 1
-	@echo "CARGO-INSTA TESTS"
-	# Turn off CI flag so that cargo insta test behaves as we expect
-	# under normal operation
-	@CI=0 cargo test -p cargo-insta
+	@cargo test -p cargo-insta
 
 check-minver:
 	@echo "MINVER CHECK"

cargo-insta/Cargo.toml

@@ -27,3 +27,4 @@ tempfile = "3.5.0"
 
 [dev-dependencies]
 walkdir = "2.3.1"
+similar= "2.2.1"