From af02e1537491cc2c49ca57755510bfeb4e3ff7d6 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Fri, 25 Aug 2017 22:57:56 +0200
Subject: [PATCH] CHANGE storyshots on cra-kitchen-sink to use this new feature

MOVE previous snapshots from storyshots to __snapshots__
---
 .../{ => __snapshots__}/index.storyshot       |  0
 .../Button.stories.storyshot                  |  0
 .../Welcome.stories.storyshot                 |  0
 addons/storyshots/stories/storyshot.test.js   |  2 ++
 .../__snapshots__/index.storyshot}            | 23 ------------------
 .../storybook-components.storyshot            | 24 +++++++++++++++++++
 .../cra-kitchen-sink/src/storyshots.test.js   |  4 ++--
 7 files changed, 28 insertions(+), 25 deletions(-)
 rename addons/storyshots/stories/directly_required/{ => __snapshots__}/index.storyshot (100%)
 rename addons/storyshots/stories/required_with_context/{ => __snapshots__}/Button.stories.storyshot (100%)
 rename addons/storyshots/stories/required_with_context/{ => __snapshots__}/Welcome.stories.storyshot (100%)
 rename examples/cra-kitchen-sink/src/{__snapshots__/storyshots.test.js.snap => stories/__snapshots__/index.storyshot} (99%)
 create mode 100644 examples/cra-kitchen-sink/src/stories/__snapshots__/storybook-components.storyshot

diff --git a/addons/storyshots/stories/directly_required/index.storyshot b/addons/storyshots/stories/directly_required/__snapshots__/index.storyshot
similarity index 100%
rename from addons/storyshots/stories/directly_required/index.storyshot
rename to addons/storyshots/stories/directly_required/__snapshots__/index.storyshot
diff --git a/addons/storyshots/stories/required_with_context/Button.stories.storyshot b/addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot
similarity index 100%
rename from addons/storyshots/stories/required_with_context/Button.stories.storyshot
rename to addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot
diff --git a/addons/storyshots/stories/required_with_context/Welcome.stories.storyshot b/addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
similarity index 100%
rename from addons/storyshots/stories/required_with_context/Welcome.stories.storyshot
rename to addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
diff --git a/addons/storyshots/stories/storyshot.test.js b/addons/storyshots/stories/storyshot.test.js
index 6e5a0fea82c..5991581f3be 100644
--- a/addons/storyshots/stories/storyshot.test.js
+++ b/addons/storyshots/stories/storyshot.test.js
@@ -6,3 +6,5 @@ initStoryshots({
   configPath: path.join(__dirname, '..', '.storybook'),
   test: multiSnapshotWithOptions({}),
 });
+
+console.log('Hey');
diff --git a/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
similarity index 99%
rename from examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
rename to examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
index 7a2ec1259fe..3b27e86a5a5 100644
--- a/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
@@ -2489,29 +2489,6 @@ exports[`Storyshots Cells/Molecules/Atoms.more with text2 1`] = `
 </button>
 `;
 
-exports[`Storyshots Navigation Menu link 1`] = `
-<div
-  className="css-t9df35"
->
-  <a
-    className="css-1enjukp"
-    href="/"
-    onClick={[Function]}
-  >
-    Menu link item
-  </a>
-</div>
-`;
-
-exports[`Storyshots Navigation Routed link 1`] = `
-<a
-  href="/"
-  onClick={[Function]}
->
-  Try clicking with different mouse buttons and modifier keys (shift/ctrl/alt/cmd)
-</a>
-`;
-
 exports[`Storyshots Some really long story kind description with text 1`] = `
 <div
   style={
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/storybook-components.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/storybook-components.storyshot
new file mode 100644
index 00000000000..2f69d273595
--- /dev/null
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/storybook-components.storyshot
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Navigation Menu link 1`] = `
+<div
+  className="css-t9df35"
+>
+  <a
+    className="css-1enjukp"
+    href="/"
+    onClick={[Function]}
+  >
+    Menu link item
+  </a>
+</div>
+`;
+
+exports[`Storyshots Navigation Routed link 1`] = `
+<a
+  href="/"
+  onClick={[Function]}
+>
+  Try clicking with different mouse buttons and modifier keys (shift/ctrl/alt/cmd)
+</a>
+`;
diff --git a/examples/cra-kitchen-sink/src/storyshots.test.js b/examples/cra-kitchen-sink/src/storyshots.test.js
index 51cce11163f..e0fd0a58cd4 100644
--- a/examples/cra-kitchen-sink/src/storyshots.test.js
+++ b/examples/cra-kitchen-sink/src/storyshots.test.js
@@ -1,4 +1,4 @@
-import initStoryshots, { snapshotWithOptions } from '@storybook/addon-storyshots';
+import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
 import path from 'path';
 
 function createNodeMock(element) {
@@ -11,7 +11,7 @@ function createNodeMock(element) {
 initStoryshots({
   framework: 'react',
   configPath: path.join(__dirname, '..', '.storybook'),
-  test: snapshotWithOptions({
+  test: multiSnapshotWithOptions({
     createNodeMock,
   }),
 });