Merge pull request #21097 from storybookjs/21050-storyshots-default-export

Storyshots: fix issue with default export in main.js

code/addons/storyshots-core/src/frameworks/configure.ts

@@ -60,7 +60,8 @@ function getConfigPathParts(input: string): Output {
       output.preview = preview;
     }
     if (main) {
-      const { stories = [], features = {} } = jest.requireActual(main);
+      const { default: defaultExport, ...rest } = jest.requireActual(main);
+      const { stories = [], features = {} } = defaultExport || rest;
 
       output.features = features;
 

code/addons/storyshots-core/stories/__snapshots__/storyshot.defaultExport.test.js.snap

@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Another Button with some emoji 1`] = `
+<div>
+  prefix
+   
+  <button
+    onClick={[Function]}
+  >
+    <span
+      aria-label="so cool"
+      role="img"
+    >
+      😀 😎 👍 💯
+    </span>
+  </button>
+   
+  suffix
+</div>
+`;
+
+exports[`Storyshots Another Button with text 1`] = `
+<div>
+  prefix
+   
+  <button
+    onClick={[Function]}
+  >
+    Hello button
+  </button>
+   
+  suffix
+</div>
+`;
+
+exports[`Storyshots Text Simple 1`] = `
+<div>
+  prefix
+   
+  contents
+   
+  suffix
+</div>
+`;

code/addons/storyshots-core/stories/default_export/Extra.stories.jsx

@@ -0,0 +1,15 @@
+/* eslint-disable react/button-has-type */
+import React from 'react';
+
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+
+storiesOf('Another Button', module)
+  .add('with text', () => <button onClick={action('clicked')}>Hello button</button>)
+  .add('with some emoji', () => (
+    <button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </button>
+  ));

code/addons/storyshots-core/stories/default_export/Text.stories.jsx

@@ -0,0 +1,5 @@
+export default {
+  title: 'Text',
+};
+
+export const Simple = () => 'contents';

code/addons/storyshots-core/stories/default_export/__snapshots__/Extra.stories@Another-_-Button@with-_-some-_-emoji.boo

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Another Button with some emoji 1`] = `
+<button
+  onClick={[Function]}
+>
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
+</button>
+`;

code/addons/storyshots-core/stories/default_export/__snapshots__/Extra.stories@Another-_-Button@with-_-text.boo

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Another Button with text 1`] = `
+<button
+  onClick={[Function]}
+>
+  Hello button
+</button>
+`;

code/addons/storyshots-core/stories/default_export/main.js

@@ -0,0 +1,5 @@
+const config = {
+  stories: ['./Text.stories.jsx', './Extra.stories.jsx'],
+};
+
+export default config;

code/addons/storyshots-core/stories/default_export/preview.jsx

@@ -0,0 +1,15 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+
+const Container = ({ children }) => <div>{children}</div>;
+
+export const decorators = [
+  (StoryFn, { parameters, globals }) => (
+    <Container>
+      {parameters.prefix} <StoryFn /> {globals.suffix}
+    </Container>
+  ),
+];
+
+export const parameters = { prefix: 'prefix' };
+export const globals = { suffix: 'suffix' };

code/addons/storyshots-core/stories/storyshot.defaultExport.test.js

@@ -0,0 +1,7 @@
+import path from 'path';
+import initStoryshots from '../src';
+
+initStoryshots({
+  framework: 'react',
+  configPath: path.join(__dirname, 'default_export'),
+});