From e22348b8547a66a6a79d3ade5da95702df4cf19c Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 17:02:20 -0700
Subject: [PATCH 01/11] allow tests in jest confg

---
 superset-frontend/jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js
index 6a5931e840d3..2d02d8386cf0 100644
--- a/superset-frontend/jest.config.js
+++ b/superset-frontend/jest.config.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 module.exports = {
-  testRegex: '\\/spec\\/.*(_spec|\\.test)\\.(j|t)sx?$',
+  testRegex: '(\\/spec|\\/src)\\/.*(_spec|\\.test)\\.(j|t)sx?$',
   moduleNameMapper: {
     '\\.(css|less)$': '<rootDir>/spec/__mocks__/styleMock.js',
     '\\.(gif|ttf|eot)$': '<rootDir>/spec/__mocks__/fileMock.js',

From ffca92e6c09132f78bd8e2f6efdceb221722389d Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 17:41:08 -0700
Subject: [PATCH 02/11] sample stories for Label component

---
 .../src/components/Label/Label.test.jsx       | 62 +++++++++++++++++++
 .../src/components/Label/label.stories.jsx    |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 superset-frontend/src/components/Label/Label.test.jsx

diff --git a/superset-frontend/src/components/Label/Label.test.jsx b/superset-frontend/src/components/Label/Label.test.jsx
new file mode 100644
index 000000000000..b243d209ea6f
--- /dev/null
+++ b/superset-frontend/src/components/Label/Label.test.jsx
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import { supersetTheme, ThemeProvider } from '@superset-ui/style';
+import { styledMount as mount } from 'spec/helpers/theming';
+import Label from './';
+import {
+  LabelGallery,
+  InteractiveLabel,
+  bsStyleKnob,
+} from './Label.stories';
+
+describe('Label', () => {
+  let wrapper;
+
+  // test the basic component
+  it('renders the base component (no onClick)', () => {
+    console.warn('!!!!!!!')
+    expect(React.isValidElement(<Label />)).toBe(true);
+  });
+
+  it('works with an onClick handler', () => {
+    const mockAction = jest.fn();
+    wrapper = mount(<Label onClick={mockAction} />);
+    wrapper.find('.label').at(1).simulate('click');
+    expect(mockAction).toHaveBeenCalled();
+  });
+
+  // test stories from the storybook!
+  it('renders all the sorybook gallery variants', () => {
+    wrapper = mount(<LabelGallery />);
+    bsStyleKnob.options.forEach(opt => {
+      expect(wrapper.find(`.label-${opt}`).text()).toEqual(
+        `style: "${opt}"`,
+      );
+    })    
+  });
+
+  // test things NOT in the storybook!
+  it('renders custom label styles without melting', () => {
+    wrapper = mount(<Label bsStyle="foobar" onClick={mockAction} />);
+    expect(wrapper.firstChild).toHaveClass('label-foobar')
+  });
+
+});
diff --git a/superset-frontend/src/components/Label/label.stories.jsx b/superset-frontend/src/components/Label/label.stories.jsx
index be1153f2832e..8d7cf1ab8ad5 100644
--- a/superset-frontend/src/components/Label/label.stories.jsx
+++ b/superset-frontend/src/components/Label/label.stories.jsx
@@ -27,7 +27,7 @@ export default {
   decorators: [withKnobs],
 };
 
-const bsStyleKnob = {
+export const bsStyleKnob = {
   label: 'Types',
   options: {
     default: 'default',

From 4662397950f41df70cdc4cc76bb8f8bfea924e94 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:23:14 -0700
Subject: [PATCH 03/11] passing tests

---
 .../src/components/Label/Label.test.jsx       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/superset-frontend/src/components/Label/Label.test.jsx b/superset-frontend/src/components/Label/Label.test.jsx
index b243d209ea6f..b922f42277d7 100644
--- a/superset-frontend/src/components/Label/Label.test.jsx
+++ b/superset-frontend/src/components/Label/Label.test.jsx
@@ -16,47 +16,41 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/* global jest */
 import React from 'react';
-import { mount } from 'enzyme';
-import { supersetTheme, ThemeProvider } from '@superset-ui/style';
 import { styledMount as mount } from 'spec/helpers/theming';
 import Label from './';
-import {
-  LabelGallery,
-  InteractiveLabel,
-  bsStyleKnob,
-} from './Label.stories';
+import { LabelGallery, bsStyleKnob } from './Label.stories';
 
 describe('Label', () => {
   let wrapper;
 
   // test the basic component
   it('renders the base component (no onClick)', () => {
-    console.warn('!!!!!!!')
     expect(React.isValidElement(<Label />)).toBe(true);
   });
 
   it('works with an onClick handler', () => {
     const mockAction = jest.fn();
     wrapper = mount(<Label onClick={mockAction} />);
-    wrapper.find('.label').at(1).simulate('click');
+    wrapper.find('.label').simulate('click');
     expect(mockAction).toHaveBeenCalled();
   });
 
   // test stories from the storybook!
   it('renders all the sorybook gallery variants', () => {
     wrapper = mount(<LabelGallery />);
-    bsStyleKnob.options.forEach(opt => {
-      expect(wrapper.find(`.label-${opt}`).text()).toEqual(
+    Object.values(bsStyleKnob.options).forEach(opt => {
+      expect(wrapper.find(`.label-${opt}`).at(0).text()).toEqual(
         `style: "${opt}"`,
       );
-    })    
+    });
   });
 
   // test things NOT in the storybook!
   it('renders custom label styles without melting', () => {
-    wrapper = mount(<Label bsStyle="foobar" onClick={mockAction} />);
-    expect(wrapper.firstChild).toHaveClass('label-foobar')
+    wrapper = mount(<Label bsStyle="foobar" />);
+    expect(wrapper.find('Label.label-foobar')).toHaveLength(1);
   });
-
 });

From f1292530c148f7c6a51a67115a6f54b3924008f1 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:31:46 -0700
Subject: [PATCH 04/11] stories to tsx!

---
 .../src/components/Label/{label.stories.jsx => Label.stories.tsx} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename superset-frontend/src/components/Label/{label.stories.jsx => Label.stories.tsx} (100%)

diff --git a/superset-frontend/src/components/Label/label.stories.jsx b/superset-frontend/src/components/Label/Label.stories.tsx
similarity index 100%
rename from superset-frontend/src/components/Label/label.stories.jsx
rename to superset-frontend/src/components/Label/Label.stories.tsx

From 9a025fa6c8992c659510df0f4eecf0e433308cd1 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:32:06 -0700
Subject: [PATCH 05/11] excluding knobs exports from published stories

---
 superset-frontend/src/components/Label/Label.stories.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/src/components/Label/Label.stories.tsx
index 8d7cf1ab8ad5..f10b64b2bd2b 100644
--- a/superset-frontend/src/components/Label/Label.stories.tsx
+++ b/superset-frontend/src/components/Label/Label.stories.tsx
@@ -25,6 +25,7 @@ export default {
   title: 'Label',
   component: Label,
   decorators: [withKnobs],
+  excludeStories: ['bsStyleKnob']
 };
 
 export const bsStyleKnob = {

From 5f5a658201f02ffbf288fde1fcfe2cd6274629dd Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:36:02 -0700
Subject: [PATCH 06/11] ts fix

---
 superset-frontend/src/components/Label/Label.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/src/components/Label/Label.stories.tsx
index f10b64b2bd2b..7f91620ff61b 100644
--- a/superset-frontend/src/components/Label/Label.stories.tsx
+++ b/superset-frontend/src/components/Label/Label.stories.tsx
@@ -66,7 +66,7 @@ export const InteractiveLabel = () => (
         bsStyleKnob.defaultValue,
         bsStyleKnob.groupId,
       )}
-      onClick={boolean('Has onClick action', false) ? action('clicked') : false}
+      onClick={boolean('Has onClick action', false) ? action('clicked') : undefined}
     >
       {text('Label', 'Label!')}
     </Label>

From f711ace01698c1840a0afda3d22c18a910bb9c6b Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:39:29 -0700
Subject: [PATCH 07/11] ts fix

---
 superset-frontend/src/components/Label/Label.stories.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/src/components/Label/Label.stories.tsx
index 7f91620ff61b..cae5cc81c5f3 100644
--- a/superset-frontend/src/components/Label/Label.stories.tsx
+++ b/superset-frontend/src/components/Label/Label.stories.tsx
@@ -64,7 +64,6 @@ export const InteractiveLabel = () => (
         bsStyleKnob.label,
         bsStyleKnob.options,
         bsStyleKnob.defaultValue,
-        bsStyleKnob.groupId,
       )}
       onClick={boolean('Has onClick action', false) ? action('clicked') : undefined}
     >

From 92de2cefabb95d1b8dfc56e5d0bab5d590ae6657 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:39:44 -0700
Subject: [PATCH 08/11] Label test to TS

---
 .../src/components/Label/{Label.test.jsx => Label.test.tsx}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename superset-frontend/src/components/Label/{Label.test.jsx => Label.test.tsx} (95%)

diff --git a/superset-frontend/src/components/Label/Label.test.jsx b/superset-frontend/src/components/Label/Label.test.tsx
similarity index 95%
rename from superset-frontend/src/components/Label/Label.test.jsx
rename to superset-frontend/src/components/Label/Label.test.tsx
index b922f42277d7..fedd830fa1e1 100644
--- a/superset-frontend/src/components/Label/Label.test.jsx
+++ b/superset-frontend/src/components/Label/Label.test.tsx
@@ -19,12 +19,13 @@
 
 /* global jest */
 import React from 'react';
+import { ReactWrapper } from 'enzyme';
 import { styledMount as mount } from 'spec/helpers/theming';
-import Label from './';
+import Label from '.';
 import { LabelGallery, bsStyleKnob } from './Label.stories';
 
 describe('Label', () => {
-  let wrapper;
+  let wrapper: ReactWrapper;
 
   // test the basic component
   it('renders the base component (no onClick)', () => {

From df643986723e4c3c7c7e221ce02f7caff7a7cefd Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Tue, 18 Aug 2020 22:42:57 -0700
Subject: [PATCH 09/11] explicitly ignoring test files in webpack bundling

---
 superset-frontend/webpack.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index 412f34560b2a..a6ad8e5e6f33 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -230,6 +230,7 @@ const config = {
       },
       {
         test: /\.tsx?$/,
+        exclude: [/\.test.tsx?$/],
         use: [
           'thread-loader',
           babelLoader,
@@ -256,7 +257,7 @@ const config = {
       {
         test: /\.jsx?$/,
         // include source code for plugins, but exclude node_modules within them
-        exclude: [/superset-ui.*\/node_modules\//],
+        exclude: [/superset-ui.*\/node_modules\//, /\.test.jsx?$/],
         include: [
           new RegExp(`${APP_DIR}/src`),
           /superset-ui.*\/src/,

From edd6f9120ef8e3a36d31851c3a01509f34e3c417 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Wed, 19 Aug 2020 09:33:57 -0700
Subject: [PATCH 10/11] linting stuff

---
 superset-frontend/src/components/Label/Label.stories.tsx | 6 ++++--
 superset-frontend/src/components/Label/Label.test.tsx    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/src/components/Label/Label.stories.tsx
index cae5cc81c5f3..35ab1b997f9e 100644
--- a/superset-frontend/src/components/Label/Label.stories.tsx
+++ b/superset-frontend/src/components/Label/Label.stories.tsx
@@ -25,7 +25,7 @@ export default {
   title: 'Label',
   component: Label,
   decorators: [withKnobs],
-  excludeStories: ['bsStyleKnob']
+  excludeStories: ['bsStyleKnob'],
 };
 
 export const bsStyleKnob = {
@@ -65,7 +65,9 @@ export const InteractiveLabel = () => (
         bsStyleKnob.options,
         bsStyleKnob.defaultValue,
       )}
-      onClick={boolean('Has onClick action', false) ? action('clicked') : undefined}
+      onClick={
+        boolean('Has onClick action', false) ? action('clicked') : undefined
+      }
     >
       {text('Label', 'Label!')}
     </Label>
diff --git a/superset-frontend/src/components/Label/Label.test.tsx b/superset-frontend/src/components/Label/Label.test.tsx
index fedd830fa1e1..92277271d7ec 100644
--- a/superset-frontend/src/components/Label/Label.test.tsx
+++ b/superset-frontend/src/components/Label/Label.test.tsx
@@ -19,6 +19,7 @@
 
 /* global jest */
 import React from 'react';
+/* eslint-disable-next-line import/no-extraneous-dependencies */
 import { ReactWrapper } from 'enzyme';
 import { styledMount as mount } from 'spec/helpers/theming';
 import Label from '.';

From d4f6aa78c3bc5070fc78090872b7bc0881af294e Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Wed, 19 Aug 2020 11:03:45 -0700
Subject: [PATCH 11/11] adding comment about test file exclusions

---
 superset-frontend/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index a6ad8e5e6f33..66b04d06f05e 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -256,7 +256,7 @@ const config = {
       },
       {
         test: /\.jsx?$/,
-        // include source code for plugins, but exclude node_modules within them
+        // include source code for plugins, but exclude node_modules and test files within them
         exclude: [/superset-ui.*\/node_modules\//, /\.test.jsx?$/],
         include: [
           new RegExp(`${APP_DIR}/src`),