fix: jest config and merge conflicts

d2iq · Apr 17, 2018 · e492d6c · e492d6c
1 parent a861ec2
commit e492d6c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 131 deletions.
diff --git a/components/badge/badge.test.tsx b/components/badge/badge.test.tsx
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,50 @@
+module.exports = {
+  "rootDir": ".",
+  "testPathIgnorePatterns": [
+    "/node_modules/",
+    "/dist/",
+    "scripts"
+  ],
+  "coverageReporters": [
+    "json",
+    "text"
+  ],
+  "projects": [
+    {
+      "displayName": "Jest",
+      "roots": [
+        "packages"
+      ],
+      "moduleFileExtensions": [
+        "ts",
+        "tsx",
+        "js",
+        "jsx",
+        "json",
+        "node"
+      ],
+      "setupTestFrameworkScriptFile": "<rootDir>/testHelper/setupTests.ts",
+      "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+      "transform": {
+        "^.+\\.tsx?$": "ts-jest"
+      }
+    },
+    {
+      "displayName": "Prettier",
+      "runner": "jest-runner-prettier",
+      "moduleFileExtensions": [
+        "js",
+        "jsx",
+        "json",
+        "ts",
+        "tsx"
+      ],
+      "testMatch": [
+        "<rootDir>/packages/**/*.{ts|tsx}",
+        "tslint.json",
+        "tsconfig.json",
+        "tsconfig.dist.json",
+      ]
+    }
+  ]
+}
diff --git a/jest.config.json b/jest.config.json
diff --git a/package.json b/package.json
@@ -30,63 +30,9 @@
     "test": "jest",
     "test:watch": "jest --watch"
   },
-  "files": ["dist"],
-  "jest": {
-    "coverageReporters": [
-      "json",
-      "text"
-    ],
-    "projects": [{
-      "displayName": "Jest",
-      "moduleFileExtensions": [
-        "ts",
-        "tsx",
-        "js",
-        "jsx",
-        "json",
-        "node"
-      ],
-      "setupTestFrameworkScriptFile": "<rootDir>/testHelper/setupTests.ts",
-      "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-      "transform": {
-        "^.+\\.tsx?$": "ts-jest"
-      },
-      "roots": [
-        "components"
-      ]
-    }, {
-      "displayName": "Prettier",
-      "runner": "jest-runner-prettier",
-      "moduleFileExtensions": [
-        "js",
-        "jsx",
-        "json",
-        "ts",
-        "tsx",
-        "css",
-        "less",
-        "scss",
-        "graphql",
-        "md",
-        "markdown"
-      ],
-      "testMatch": [
-        "**/*.js",
-        "**/*.jsx",
-        "tslint.json",
-        "tsconfig.json",
-        "tsconfig.dist.json",
-        "components/**/*.ts",
-        "components/**/*.tsx",
-        "**/*.css",
-        "**/*.less",
-        "**/*.scss",
-        "**/*.graphql",
-        "**/*.md",
-        "**/*.markdown"
-      ]
-    }]
-  },
+  "files": [
+    "dist"
+  ],
   "typings": "dist/components/index",
   "dependencies": {
     "emotion": "9.0.2",

diff --git a/packages/badge/components/badgeButton.tsx b/packages/badge/components/badgeButton.tsx
@@ -1,3 +1,4 @@
+import { css } from "emotion";
 import * as React from "react";
 import { badge as badgeButton } from "../style";
 
@@ -27,7 +28,15 @@ export class BadgeButton extends React.PureComponent<IBadgeButtonProps, {}> {
 
   public render() {
     const { appearance, children, onClick, tabIndex } = this.props;
-    const props = { onClick, tabIndex, className: badgeButton(appearance) };
+    const props = {
+      onClick,
+      tabIndex,
+      className: css`
+        outline: none;
+        cursor: pointer;
+        ${badgeButton(appearance)};
+      `
+    };
 
     return <button {...props}>{children}</button>;
   }

diff --git a/packages/badge/stories/badge.stories.tsx b/packages/badge/stories/badge.stories.tsx
@@ -31,4 +31,11 @@ storiesOf("Badge", module)
     "Outline",
     "Outline badges for when we want the density of the badge to be lighter e.g. when next to data in a table cell",
     () => <Badge appearance="outline">Outline</Badge>
+  )
+  .addWithInfo(
+    "Button",
+    "Button badges for when we want add click event",
+    () => (
+      <BadgeButton onClick={action("badge button")}>badge button</BadgeButton>
+    )
   );
diff --git a/packages/badge/tests/__snapshots__/badgeButton.test.tsx.snap b/packages/badge/tests/__snapshots__/badgeButton.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`BadgeButton accept jsx as children 1`] = `
 <button
-  className="css-i4ctwy"
+  className="css-y5qucr"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -14,7 +14,7 @@ exports[`BadgeButton accept jsx as children 1`] = `
 
 exports[`BadgeButton danger 1`] = `
 <button
-  className="css-o307zd"
+  className="css-aqlru0"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -24,7 +24,7 @@ exports[`BadgeButton danger 1`] = `
 
 exports[`BadgeButton default 1`] = `
 <button
-  className="css-i4ctwy"
+  className="css-y5qucr"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -34,7 +34,7 @@ exports[`BadgeButton default 1`] = `
 
 exports[`BadgeButton outline 1`] = `
 <button
-  className="css-ml4yrq"
+  className="css-j343ve"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -44,7 +44,7 @@ exports[`BadgeButton outline 1`] = `
 
 exports[`BadgeButton primary 1`] = `
 <button
-  className="css-361qnz"
+  className="css-q2731u"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -54,7 +54,7 @@ exports[`BadgeButton primary 1`] = `
 
 exports[`BadgeButton success 1`] = `
 <button
-  className="css-xr9z4s"
+  className="css-10v0ttp"
   onClick={[Function]}
   tabIndex={-1}
 >
@@ -64,7 +64,7 @@ exports[`BadgeButton success 1`] = `
 
 exports[`BadgeButton warning 1`] = `
 <button
-  className="css-19otvs4"
+  className="css-1qzzy6w"
   onClick={[Function]}
   tabIndex={-1}
 >