Merge pull request #72 from mkantor/make-debug-snapshots-work-for-release

Make snapshots portable across debug/release builds.

Author: mkantor

tests/integration_tests.rs

@@ -34,6 +34,10 @@ async fn samples_match_snapshots() {
             // If dynamic content files mention where the repo is checked
             // out, redact it to keep tests portable.
             .map(|(key, value)| (key, value.replace(PROJECT_DIRECTORY, "$PROJECT_DIRECTORY")))
+            // Also redact release modes in paths so we can release with
+            // snapshots generated during debug builds.
+            .map(|(key, value)| (key, value.replace("target/debug", "target/$PROFILE")))
+            .map(|(key, value)| (key, value.replace("target/release", "target/$PROFILE")))
             // Also remove the prefix used on log messages.
             .map(|(key, value)| (key, String::from(log_prefix_regex.replace_all(&value, ""))))
             .collect::<BTreeMap<_, _>>();

tests/snapshots/integration_tests__executables.snap

@@ -8,11 +8,11 @@ cat.txt.sh: ""
 count-cli-args.txt.sh: "0\n"
 error.txt.sh: "Unable to emit rendered content.\n\nCaused by:\n    Process exited with code 1: boom!\n    \n"
 get-pwd.txt.hbs: "this is pwd from subdirectory:\n$PROJECT_DIRECTORY/samples/executables/subdirectory\n"
-get-render-data.json.hbs: "{\"/\":{\"NO-SNAPSHOT-random\":\"/NO-SNAPSHOT-random\",\"NO-SNAPSHOT-system-info\":\"/NO-SNAPSHOT-system-info\",\"cat\":\"/cat\",\"count-cli-args\":\"/count-cli-args\",\"error\":\"/error\",\"get-pwd\":\"/get-pwd\",\"get-render-data\":\"/get-render-data\",\"ls\":\"/ls\",\"output-and-error\":\"/output-and-error\",\"pwd\":\"/pwd\",\"render-data\":\"/render-data\",\"slow\":\"/slow\",\"slow-error\":\"/slow-error\",\"slow-template\":\"/slow-template\",\"subdirectory/\":{\"pwd\":\"/subdirectory/pwd\"}},\"server-info\":{\"version\":\"0.3.0\",\"operator-path\":\"$PROJECT_DIRECTORY/target/debug/operator\",\"socket-address\":\"$SOCKET_ADDRESS\"},\"target-media-type\":\"application/json\",\"request\":{\"route\":\"/get-render-data\",\"query-parameters\":{}},\"error-code\":null}\n"
+get-render-data.json.hbs: "{\"/\":{\"NO-SNAPSHOT-random\":\"/NO-SNAPSHOT-random\",\"NO-SNAPSHOT-system-info\":\"/NO-SNAPSHOT-system-info\",\"cat\":\"/cat\",\"count-cli-args\":\"/count-cli-args\",\"error\":\"/error\",\"get-pwd\":\"/get-pwd\",\"get-render-data\":\"/get-render-data\",\"ls\":\"/ls\",\"output-and-error\":\"/output-and-error\",\"pwd\":\"/pwd\",\"render-data\":\"/render-data\",\"slow\":\"/slow\",\"slow-error\":\"/slow-error\",\"slow-template\":\"/slow-template\",\"subdirectory/\":{\"pwd\":\"/subdirectory/pwd\"}},\"server-info\":{\"version\":\"0.3.0\",\"operator-path\":\"$PROJECT_DIRECTORY/target/$PROFILE/operator\",\"socket-address\":\"$SOCKET_ADDRESS\"},\"target-media-type\":\"application/json\",\"request\":{\"route\":\"/get-render-data\",\"query-parameters\":{}},\"error-code\":null}\n"
 ls.txt.sh: "NO-SNAPSHOT-random.bin.sh\nNO-SNAPSHOT-system-info.html.sh\ncat.txt.sh\ncount-cli-args.txt.sh\nerror.txt.sh\nget-pwd.txt.hbs\nget-render-data.json.hbs\nls.txt.sh\noutput-and-error.txt.sh\npwd.txt.sh\nrender-data.json.sh\nslow-error.txt.sh\nslow-template.txt.hbs\nslow.txt.sh\nsubdirectory\n"
 output-and-error.txt.sh: "Unable to emit rendered content.\n\nCaused by:\n    Process exited with code 1\n"
 pwd.txt.sh: "$PROJECT_DIRECTORY/samples/executables\n"
-render-data.json.sh: "{\"/\":{\"NO-SNAPSHOT-random\":\"/NO-SNAPSHOT-random\",\"NO-SNAPSHOT-system-info\":\"/NO-SNAPSHOT-system-info\",\"cat\":\"/cat\",\"count-cli-args\":\"/count-cli-args\",\"error\":\"/error\",\"get-pwd\":\"/get-pwd\",\"get-render-data\":\"/get-render-data\",\"ls\":\"/ls\",\"output-and-error\":\"/output-and-error\",\"pwd\":\"/pwd\",\"render-data\":\"/render-data\",\"slow\":\"/slow\",\"slow-error\":\"/slow-error\",\"slow-template\":\"/slow-template\",\"subdirectory/\":{\"pwd\":\"/subdirectory/pwd\"}},\"server-info\":{\"version\":\"0.3.0\",\"operator-path\":\"$PROJECT_DIRECTORY/target/debug/operator\",\"socket-address\":\"$SOCKET_ADDRESS\"},\"target-media-type\":\"application/json\",\"request\":{\"route\":\"/render-data\",\"query-parameters\":{}},\"error-code\":null}\n"
+render-data.json.sh: "{\"/\":{\"NO-SNAPSHOT-random\":\"/NO-SNAPSHOT-random\",\"NO-SNAPSHOT-system-info\":\"/NO-SNAPSHOT-system-info\",\"cat\":\"/cat\",\"count-cli-args\":\"/count-cli-args\",\"error\":\"/error\",\"get-pwd\":\"/get-pwd\",\"get-render-data\":\"/get-render-data\",\"ls\":\"/ls\",\"output-and-error\":\"/output-and-error\",\"pwd\":\"/pwd\",\"render-data\":\"/render-data\",\"slow\":\"/slow\",\"slow-error\":\"/slow-error\",\"slow-template\":\"/slow-template\",\"subdirectory/\":{\"pwd\":\"/subdirectory/pwd\"}},\"server-info\":{\"version\":\"0.3.0\",\"operator-path\":\"$PROJECT_DIRECTORY/target/$PROFILE/operator\",\"socket-address\":\"$SOCKET_ADDRESS\"},\"target-media-type\":\"application/json\",\"request\":{\"route\":\"/render-data\",\"query-parameters\":{}},\"error-code\":null}\n"
 slow-error.txt.sh: "Unable to emit rendered content.\n\nCaused by:\n    Process exited with code 1: Boom!\n    \n"
 slow-template.txt.hbs: "🔴 Ready…\n🟡 Set…\n🟢 Go!\n🏁 Finished!\n"
 slow.txt.sh: "🔴 Ready…\n🟡 Set…\n🟢 Go!\n"

tests/snapshots/integration_tests__render-context.snap

@@ -8,6 +8,6 @@ a.html: "a\n"
 request-route-wrapper.txt.hbs: "route from this file: /request-route-wrapper\nroute from file included via partial: /request-route-wrapper\nroute from file included via get helper: /request-route-wrapper"
 request-route.txt.hbs: /request-route
 routes.txt.hbs: "a: /a\nrequest-route: /request-route\nrequest-route-wrapper: /request-route-wrapper\nroutes: /routes\nserver-info: /server-info\nwith-empty-context: /with-empty-context\n"
-server-info.txt.hbs: "version: 0.3.0\noperator-path: $PROJECT_DIRECTORY/target/debug/operator\nsocket-address: $SOCKET_ADDRESS\n"
+server-info.txt.hbs: "version: 0.3.0\noperator-path: $PROJECT_DIRECTORY/target/$PROFILE/operator\nsocket-address: $SOCKET_ADDRESS\n"
 with-empty-context.html.hbs: "this with normal context: [object]\nthis with funky context: true\ncalling get for static content with funky context: a\n\n"