.github/workflows/clippy.yml

@@ -0,0 +1,13 @@
+name: Clippy
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run clippy
+      run: make lint

.github/workflows/rustfmt.yml

@@ -0,0 +1,13 @@
+name: Rustfmt
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run rustfmt
+      run: make format-check

.github/workflows/tests.yml

@@ -0,0 +1,13 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Test
+      run: make test

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0
+
+* Fix invalid offset calculation for inline snapshot (#137)
+* Added support for newtype variant redactions. (#139)
+
 ## 1.1.0
 
 * Added the `INSTA_SNAPSHOT_REFERENCES_FILE` environment variable to support

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "insta"
-version = "1.1.0"
+version = "1.2.0"
 license = "Apache-2.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 description = "A snapshot testing library for Rust"

Makefile

@@ -6,9 +6,14 @@ build:
 doc:
 	@cargo doc --all-features
 
-test: cargotest
+test: cargotest cargo-insta-tests
+
+cargo-insta-tests:
+	@echo "CARGO-INSTA INTEGRATION TESTS"
+	@cd cargo-insta/integration-tests; cargo run
 
 cargotest:
+	@echo "CARGO TESTS"
 	@rustup component add rustfmt 2> /dev/null
 	@cargo test
 	@cargo test --all-features

cargo-insta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-insta"
-version = "1.1.0"
+version = "1.2.0"
 license = "Apache-2.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 description = "A review tool for the insta snapshot testing library for Rust"
@@ -11,7 +11,7 @@ edition = "2018"
 readme = "README.md"
 
 [dependencies]
-insta = { version = "1.1.0", path = "..", features = ["redactions"] }
+insta = { version = "1.2.0", path = "..", features = ["redactions"] }
 console = "0.12.0"
 clap = "2.33.0"
 difference = "2.0.0"

cargo-insta/integration-tests/.gitignore

@@ -0,0 +1,2 @@
+tests/
+Cargo.lock

cargo-insta/integration-tests/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "integration-tests"
+version = "0.1.0"
+authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dircpy = "0.3.4"
+insta = { version = "1.1.0", path = "../..", features = ["redactions", "glob"] }
+walkdir = "2.3.1"
+serde = { version = "1.0.117", features = ["derive"] }

cargo-insta/integration-tests/src/main.rs

@@ -0,0 +1,58 @@
+use std::env;
+use std::fs;
+use std::path::Path;
+use std::process::Command;
+
+use dircpy::CopyBuilder;
+use insta::{assert_snapshot, Settings};
+use walkdir::WalkDir;
+
+fn main() {
+    // copy new tests over
+    fs::remove_dir_all("tests").ok();
+    CopyBuilder::new("test-input", "tests")
+        .overwrite(true)
+        .run()
+        .unwrap();
+
+    // delete old build artifacts
+    Command::new("cargo")
+        .arg("clean")
+        .arg("--package=integration-tests")
+        .status()
+        .unwrap();
+
+    // make sure cargo-insta is built
+    Command::new("cargo")
+        .arg("build")
+        .current_dir("..")
+        .status()
+        .unwrap();
+
+    // run tests and accept snapshots
+    Command::new("../target/debug/cargo-insta")
+        .arg("test")
+        .arg("--accept")
+        .status()
+        .unwrap();
+
+    // use insta itself to assert snapshots
+    for entry in WalkDir::new("test-input") {
+        let entry = entry.unwrap();
+        let filename = entry
+            .path()
+            .strip_prefix("test-input/")
+            .unwrap()
+            .to_str()
+            .unwrap();
+        if filename.ends_with(".rs") {
+            let gen_file = Path::new("tests").join(filename);
+            let mut settings = Settings::clone_current();
+            settings.set_input_file(&gen_file);
+            let snapshot = &filename[..filename.len() - 3];
+            settings.bind(|| {
+                assert_snapshot!(snapshot, &fs::read_to_string(gen_file).unwrap());
+            });
+        }
+    }
+}

cargo-insta/integration-tests/src/snapshots/integration_tests__test_basic_utf8_inline.snap

@@ -0,0 +1,24 @@
+---
+source: src/main.rs
+expression: "&fs::read_to_string(gen_file).unwrap()"
+input_file: tests/test_basic_utf8_inline.rs
+---
+#[test]
+#[rustfmt::skip]
+fn test_non_basic_plane() {
+    /* an offset here ❄️ */ insta::assert_snapshot!("a 😀oeu", @"a 😀oeu");
+}
+
+#[test]
+fn test_remove_existing_value() {
+    insta::assert_snapshot!("this is the new value", @"this is the new value");
+}
+
+#[test]
+fn test_remove_existing_value_multiline() {
+    insta::assert_snapshot!(
+        "this is the new value",
+        @"this is the new value"
+    );
+}
+

cargo-insta/integration-tests/src/snapshots/integration_tests__test_json_inline.snap

@@ -0,0 +1,29 @@
+---
+source: src/main.rs
+expression: "&fs::read_to_string(gen_file).unwrap()"
+input_file: tests/test_json_inline.rs
+---
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct User {
+    id: u64,
+    email: String,
+}
+
+#[test]
+fn test_json_snapshot() {
+    let user = User {
+        id: 42,
+        email: "john.doe@example.com".into(),
+    };
+    insta::assert_json_snapshot!(&user, {
+        ".id" => "[user_id]",
+    }, @r###"
+    {
+      "id": "[user_id]",
+      "email": "john.doe@example.com"
+    }
+    "###);
+}
+

cargo-insta/integration-tests/src/snapshots/integration_tests__test_yaml_inline.snap

@@ -0,0 +1,28 @@
+---
+source: src/main.rs
+expression: "&fs::read_to_string(gen_file).unwrap()"
+input_file: tests/test_yaml_inline.rs
+---
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct User {
+    id: u64,
+    email: String,
+}
+
+#[test]
+fn test_yaml_snapshot() {
+    let user = User {
+        id: 42,
+        email: "john.doe@example.com".into(),
+    };
+    insta::assert_yaml_snapshot!(&user, {
+        ".id" => "[user_id]",
+    }, @r###"
+    ---
+    id: "[user_id]"
+    email: john.doe@example.com
+    "###);
+}
+

cargo-insta/integration-tests/test-input/test_basic_utf8_inline.rs

@@ -0,0 +1,20 @@
+#[test]
+#[rustfmt::skip]
+fn test_non_basic_plane() {
+    /* an offset here ❄️ */ insta::assert_snapshot!("a 😀oeu", @"");
+}
+
+#[test]
+fn test_remove_existing_value() {
+    insta::assert_snapshot!("this is the new value", @"this is the old value");
+}
+
+#[test]
+fn test_remove_existing_value_multiline() {
+    insta::assert_snapshot!(
+        "this is the new value",
+        @"this is\
+        this is the old value\
+        it really is"
+    );
+}

cargo-insta/integration-tests/test-input/test_json_inline.rs

@@ -0,0 +1,18 @@
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct User {
+    id: u64,
+    email: String,
+}
+
+#[test]
+fn test_json_snapshot() {
+    let user = User {
+        id: 42,
+        email: "john.doe@example.com".into(),
+    };
+    insta::assert_json_snapshot!(&user, {
+        ".id" => "[user_id]",
+    }, @"");
+}

cargo-insta/integration-tests/test-input/test_yaml_inline.rs

@@ -0,0 +1,18 @@
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct User {
+    id: u64,
+    email: String,
+}
+
+#[test]
+fn test_yaml_snapshot() {
+    let user = User {
+        id: 42,
+        email: "john.doe@example.com".into(),
+    };
+    insta::assert_yaml_snapshot!(&user, {
+        ".id" => "[user_id]",
+    }, @"");
+}

cargo-insta/src/inline.rs

@@ -75,8 +75,14 @@ impl FilePatcher {
         let inline = &mut self.inline_snapshots[id];
 
         // find prefix and suffix on the first and last lines
-        let prefix = self.lines[inline.start.0][..inline.start.1].to_string();
-        let suffix = self.lines[inline.end.0][inline.end.1..].to_string();
+        let prefix: String = self.lines[inline.start.0]
+            .chars()
+            .take(inline.start.1)
+            .collect();
+        let suffix: String = self.lines[inline.end.0]
+            .chars()
+            .skip(inline.end.1)
+            .collect();
 
         // replace lines
         let snapshot_line_contents =

scripts/bump-version.sh

@@ -9,3 +9,4 @@ NEW_VERSION="${1}"
 echo "Bumping version: ${NEW_VERSION}"
 perl -pi -e "s/^version = \".*?\"/version = \"$NEW_VERSION\"/" Cargo.toml
 perl -pi -e "s/^(insta.*)?version = \".*?\"/\$1version = \"$NEW_VERSION\"/" cargo-insta/Cargo.toml
+cd cargo-insta; cargo check

src/redaction.rs

@@ -450,6 +450,14 @@ impl<'a> Selector<'a> {
                     name,
                     Box::new(self.redact_impl(*inner, redaction, path)),
                 ),
+                Content::NewtypeVariant(name, index, variant_name, inner) => {
+                    Content::NewtypeVariant(
+                        name,
+                        index,
+                        variant_name,
+                        Box::new(self.redact_impl(*inner, redaction, path)),
+                    )
+                }
                 Content::Some(contents) => {
                     Content::Some(Box::new(self.redact_impl(*contents, redaction, path)))
                 }