FIX tests & linting

lib/api/scripts/generateVersion.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const output = version => `export default '${version}';\n`;
+const output = version => `export const version = '${version}';\n`;
 
 const text = fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8');
 const json = JSON.parse(text);

lib/api/src/modules/stories.ts

@@ -188,16 +188,16 @@ const initStoriesApi = ({ store, navigate, storyId: initialStoryId, viewMode: in
             const parent = index > 0 && soFar[index - 1].id;
             const id = sanitize(parent ? `${parent}-${name}` : name);
 
-            const story: Group = {
-              id,
+            const result: Group = {
               ...group,
+              id,
               parent,
               depth: index,
               children: [],
               isComponent: index === original.length - 1,
               isRoot: !!root && index === 0,
             };
-            return soFar.concat([story]);
+            return soFar.concat([result]);
           },
           [] as GroupsList
         );

lib/api/src/modules/versions.ts

@@ -1,7 +1,7 @@
 import { fetch } from 'global';
 import { logger } from '@storybook/client-logger';
 
-import currentVersion from '../version';
+import { version as currentVersion } from '../version';
 
 import { Module, API } from '../index';
 

lib/api/src/tests/id.test.js

@@ -15,7 +15,9 @@ describe('toId', () => {
   });
 
   it('does not allow kind with *no* url chars', () => {
-    expect(() => toId('?', 'asdf')).toThrow(`Invalid kind '?', must include alphanumeric characters`);
+    expect(() => toId('?', 'asdf')).toThrow(
+      `Invalid kind '?', must include alphanumeric characters`
+    );
   });
 
   it('does not allow empty kind', () => {
@@ -23,10 +25,14 @@ describe('toId', () => {
   });
 
   it('does not allow story with *no* url chars', () => {
-    expect(() => toId('kind', '?')).toThrow(`Invalid story '?', must include alphanumeric characters`);
+    expect(() => toId('kind', '?')).toThrow(
+      `Invalid story '?', must include alphanumeric characters`
+    );
   });
 
   it('does not allow empty story', () => {
-    expect(() => toId('kind', '')).toThrow(`Invalid story '', must include alphanumeric characters`);
+    expect(() => toId('kind', '')).toThrow(
+      `Invalid story '', must include alphanumeric characters`
+    );
   });
 });

lib/api/src/tests/notifications.test.js

@@ -1,4 +1,4 @@
-import initNotifications from '../notifications';
+import initNotifications from '../modules/notifications';
 
 describe('notifications API', () => {
   it('allows adding notifications', () => {

lib/api/src/tests/shortcut.test.js

@@ -1,5 +1,7 @@
+import { KeyboardEvent } from 'global';
 import { eventToShortcut, keyToSymbol } from '../lib/shortcut';
-const ev = (attr: object) => new KeyboardEvent('keydown', { ...attr });
+
+const ev = attr => new KeyboardEvent('keydown', { ...attr });
 
 describe('eventToShortcut', () => {
   test('it handles alt key inputs', () => {

lib/api/src/tests/shortcuts.test.js

@@ -1,4 +1,4 @@
-import initShortcuts from '../shortcuts';
+import initShortcuts from '../modules/shortcuts';
 
 function createMockStore() {
   let state = {};

lib/api/src/tests/url.test.js

@@ -1,6 +1,6 @@
 import qs from 'qs';
 
-import initURL from '../url';
+import initURL from '../modules/url';
 
 jest.useFakeTimers();
 

lib/api/src/tests/versions.test.js

@@ -2,15 +2,22 @@ import { fetch } from 'global';
 import initVersions from '../modules/versions';
 
 jest.mock('../version', () => ({
-  default: '3.0.0',
+  version: '3.0.0',
 }));
 
 jest.mock('global', () => ({
   fetch: jest.fn(),
 }));
 
+jest.mock('@storybook/client-logger');
+
 function createMockStore() {
-  let state = {};
+  let state = {
+    versions: {
+      latest: {},
+      current: {},
+    },
+  };
   return {
     getState: jest.fn().mockImplementation(() => state),
     setState: jest.fn().mockImplementation(s => {
@@ -27,16 +34,12 @@ const standardResponse = {
   }),
 };
 
-jest.mock('@storybook/client-logger');
-
 describe('versions API', () => {
   it('sets initial state with current version', async () => {
     const store = createMockStore();
     const { state } = initVersions({ store });
 
-    expect(state.versions).toEqual({
-      current: { version: '3.0.0' },
-    });
+    expect(state.versions.current).toEqual({ version: '3.0.0' });
   });
 
   it('sets initial state based on persisted versions', async () => {
@@ -121,9 +124,7 @@ describe('versions API', () => {
     fetch.mockRejectedValueOnce(new Error('fetch failed'));
     await init({ api: { addNotification: jest.fn(), ...api } });
 
-    expect(store.getState().versions).toEqual({
-      current: { version: '3.0.0' },
-    });
+    expect(store.getState().versions.current).toEqual({ version: '3.0.0' });
   });
 
   it('sets an update notification right away in the init function', async () => {

lib/api/src/version.ts

@@ -1 +1 @@
-export default '5.0.0-alpha.10';
+export const version = '5.0.0-alpha.10';