Fix merge conflict

.eslintignore

@@ -3,4 +3,6 @@ dist
 coverage
 **/*.d.ts
 test
-_temp_extension
+_temp_extension
+babel.config.ts
+jest.config.ts

package.json

@@ -44,7 +44,9 @@
     "prepare": "jlpm run clean && jlpm run build:prod",
     "watch": "run-p watch:src watch:labextension",
     "watch:labextension": "jupyter labextension watch .",
-    "watch:src": "tsc -w"
+    "watch:src": "tsc -w",
+    "test": "jest --watch",
+    "test:cov": "jest --collect-coverage"
   },
   "dependencies": {
     "@jupyterlab/application": "^3.0.3",
@@ -64,13 +66,28 @@
     "@lumino/dragdrop": "^1.7.1",
     "@lumino/messaging": "^1.4.3",
     "@lumino/properties": "^1.2.3",
-    "@lumino/signaling": "^1.4.3"
+    "@lumino/signaling": "^1.4.3",
+    "@lumino/widgets": "^1.13.2"
   },
   "devDependencies": {
     "@jupyterlab/builder": "^3.0.0-rc.13",
     "@typescript-eslint/eslint-plugin": "^2.27.0",
     "@typescript-eslint/parser": "^2.27.0",
     "eslint": "^7.5.0",
+    "@babel/core": "^7",
+    "@babel/preset-env": "^7.12.1",
+    "@babel/preset-react": "^7.12.5",
+    "@testing-library/react": "^11.1.1",
+    "@types/enzyme": "^3.10.8",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
+    "@types/jest": "^26.0.15",
+    "@types/node-fetch": "^2.5.7",
+    "@types/react": "^16.9.56",
+    "@types/react-dom": "^16.9.9",
+    "@types/react-test-renderer": "^16.9.3",
+    "babel-jest": "^26.6.3",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.5",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.20.4",
@@ -82,7 +99,12 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.0",
     "rimraf": "^3.0.2",
-    "typescript": "~4.1.3"
+    "typescript": "~4.1.3",
+    "react-test-renderer": "^17.0.1",
+    "ts-jest": "^26.4.4"
+  },
+  "resolutions": {
+    "@types/react": "^16.9.56"
   },
   "sideEffects": [
     "style/*.css",

test/codeSnippetEditor.test.tsx

@@ -0,0 +1,29 @@
+// start testing code snippet editor
+// need to include functions
+
+import React from 'react';
+import renderer from 'react-test-renderer';
+import { shallow } from 'enzyme';
+
+import { CodeSnippetEditor } from '../src/CodeSnippetEditor';
+// import { CodeSnippetDisplay } from '../src/CodeSnippetDisplay';
+import { CodeSnippetEditorTags } from '../src/CodeSnippetEditorTags';
+// import { Link } from '../src/Link';
+
+
+interface ICodeSnippetEditorTagProps {
+    selectedTags: string[];
+    tags: string[];
+    handleChange: (selectedTags: string[], allTags: string[]) => void;
+};
+
+interface ICodeSnippetEditorTagState {
+    selectedTags: string[];
+    tags: string[];
+    plusIconShouldHide: boolean;
+    addingNewTag: boolean;
+};
+
+describe('jupyterlab/codeSnippetEditor', () => {
+
+})

tsconfig.test.json

@@ -15,7 +15,7 @@
         "es2015.iterable",
         "es2017.object"
       ],
-      "types": ["jest"],
+      "types": ["jest", "node"],
       "typeRoots": ["./types", "./node_modules/@types"],
       "jsx": "react",
       "resolveJsonModule": true,
@@ -24,4 +24,4 @@
       "skipLibCheck": true
     },
     "include": ["src/**/*", "test/**/*"]
-  }
+  }