Restore JS tests

jupyterlab · Mar 13, 2021 · e50ae3f · e50ae3f
1 parent c081dbd
commit e50ae3f
Show file tree

Hide file tree

Showing 17 changed files with 451 additions and 273 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,4 @@ node_modules
 dist
 coverage
 **/*.d.ts
-tests
+lib
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    project: 'tsconfig.json',
+    project: 'tsconfig.eslint.json',
     sourceType: 'module'
   },
   plugins: ['@typescript-eslint'],

diff --git a/jest.config.js b/jest.config.js
@@ -16,15 +16,15 @@ const {
 module.exports = {
   coverageDirectory,
   moduleFileExtensions,
-  moduleNameMapper: {...moduleNameMapper, "monaco-editor": "<rootDir>/node_modules/react-monaco-editor"},
+  moduleNameMapper,
   preset,
   setupFilesAfterEnv,
   setupFiles,
   testPathIgnorePatterns,
   transform,
   automock: false,
   testRegex: 'src/tests/.*.spec.ts[x]?$',
-  transformIgnorePatterns: ['/node_modules/(?!(@?jupyterlab.*)/)'],
+  transformIgnorePatterns: ['/node_modules/(?!(@?jupyterlab.*|react-spinners)/)'],
   setupFiles: ['<rootDir>/setupJest.js'],
   globals: {
     'ts-jest': {

diff --git a/src/components/browser/PullRequestItem.tsx b/src/components/browser/PullRequestItem.tsx
@@ -6,7 +6,7 @@ import {
   linkIcon
 } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { BeatLoader } from 'react-spinners';
 import { CommandIDs, IFile, IPullRequest } from '../../tokens';
 import { requestAPI } from '../../utils';
@@ -49,21 +49,21 @@ export function PullRequestItem(props: IPullRequestItemProps): JSX.Element {
   /**
    * Pull request modified files
    */
-  const [files, setFiles] = useState<IFile[] | null>(null);
+  const [files, setFiles] = React.useState<IFile[] | null>(null);
   /**
    * Is the file list expanded?
    */
-  const [isExpanded, setIsExpanded] = useState<boolean>(false);
+  const [isExpanded, setIsExpanded] = React.useState<boolean>(false);
   /**
    * Is the file list being loaded?
    */
-  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [isLoading, setIsLoading] = React.useState<boolean>(false);
   /**
    * Error message
    */
-  const [error, setError] = useState<string | null>(null);
+  const [error, setError] = React.useState<string | null>(null);
 
-  useEffect(() => {
+  React.useEffect(() => {
     setFiles(null);
     setIsExpanded(false);
     setIsLoading(false);

diff --git a/src/components/discussion/Discussion.ts b/src/components/discussion/Discussion.ts
@@ -63,15 +63,15 @@ export class Discussion extends Panel {
           : 'Leave a comment';
 
         const node = generateNode('div', {
-          class: 'jp-PullRequestCommentItem'
+          class: 'jp-PullRequestCommentItem',
         });
         const p = node
           .appendChild(
             generateNode('div', { class: 'jp-PullRequestCommentItemContent' })
           )
           .appendChild(
             generateNode('p', {
-              class: 'jp-PullRequestCommentItemContentTitle'
+              class: 'jp-PullRequestCommentItemContentTitle',
             })
           );
         p.innerHTML = msg;
@@ -94,9 +94,11 @@ export class Discussion extends Panel {
       latestWidget.parent = null;
       latestWidget.dispose();
 
-      this.addWidget(
-        this._inputShown ? this.createCommentInput() : this.createReplyButton()
-      );
+      if (this._inputShown) {
+        this.addWidget(this.createCommentInput());
+      } else if (this._thread.singleton !== true) {
+        this.addWidget(this.createReplyButton());
+      }
     }
   }
 
@@ -105,7 +107,7 @@ export class Discussion extends Panel {
    */
   protected initNode(): void {
     const expandButton = generateNode('button', {
-      class: 'jp-PullRequestExpandButton'
+      class: 'jp-PullRequestExpandButton',
     }) as HTMLButtonElement;
     expandButton.appendChild(
       caretUpIcon.element({ tag: 'span', title: 'Collapse Discussion' })
@@ -133,15 +135,17 @@ export class Discussion extends Panel {
    * Add the thread view in the widget
    */
   protected addThreadView(): void {
-    this._thread.comments.forEach(comment => {
+    this._thread.comments.forEach((comment) => {
       this.addWidget(
         new CommentWidget({ comment, renderMime: this._renderMime })
       );
     });
     if (this._inputShown) {
       this.addWidget(this.createCommentInput());
     } else {
-      this.addWidget(this.createReplyButton());
+      if (this._thread.singleton !== true) {
+        this.addWidget(this.createReplyButton());
+      }
     }
   }
 
@@ -156,7 +160,7 @@ export class Discussion extends Panel {
       body = {
         ...body,
         line: this._thread.line,
-        originalLine: this._thread.originalLine
+        originalLine: this._thread.originalLine,
       };
     } else {
       body = { ...body, discussionId: this._thread.id };
@@ -176,7 +180,7 @@ export class Discussion extends Panel {
         text: response.text,
         updatedAt: response.updateAt,
         userName: response.userName,
-        userPicture: response.userPicture
+        userPicture: response.userPicture,
       };
       // Update discussion reference
       if (response.inReplyTo) {
@@ -215,7 +219,7 @@ export class Discussion extends Panel {
   private createCommentInput(): InputComment {
     const widget = new InputComment({
       handleSubmit: this.handleAddComment.bind(this),
-      handleCancel: this.handleCancelComment.bind(this)
+      handleCancel: this.handleCancelComment.bind(this),
     });
     widget.addClass('jp-PullRequestCommentItem');
     return widget;
@@ -235,12 +239,12 @@ export class Discussion extends Panel {
           {
             click: () => {
               this.inputShown = true;
-            }
+            },
           }
         )
       );
     return new Widget({
-      node
+      node,
     });
   }
 

diff --git a/src/tests/Browser.spec.tsx b/src/tests/Browser.spec.tsx
@@ -0,0 +1,32 @@
+import { shallow } from 'enzyme';
+import 'jest';
+import * as React from 'react';
+import * as samplePRs from './sample-responses/samplepr.json';
+import { IBrowserProps, Browser } from '../components/browser/Browser';
+
+// Unit tests for PullRequestTab
+describe('Browser', () => {
+  const DEFAULT_PROPS: IBrowserProps = {
+    commands: {} as any,
+    docRegistry: {} as any,
+    prGroups: [
+      { name: 'group1', pullRequests: (samplePRs as any).default },
+      { name: 'group2', pullRequests: (samplePRs as any).default }
+    ]
+  };
+
+  // Test render
+  describe('#render()', () => {
+    const component = shallow(<Browser {...DEFAULT_PROPS} />);
+    it('should be a div', () => {
+      expect(component.find('div')).toHaveLength(1);
+      expect(component.find('.jp-PullRequestBrowser')).toHaveLength(1);
+    });
+    it('should have a list', () => {
+      expect(component.find('ul')).toHaveLength(1);
+    });
+    it('should have two BrowserGroup', () => {
+      expect(component.find('BrowserGroup')).toHaveLength(2);
+    });
+  });
+});
diff --git a/src/tests/BrowserGroup.spec.tsx b/src/tests/BrowserGroup.spec.tsx
@@ -0,0 +1,84 @@
+import { shallow } from 'enzyme';
+import 'jest';
+import * as React from 'react';
+import {
+  BrowserGroup,
+  IBrowserGroupProps,
+} from '../components/browser/BrowserGroup';
+import { PullRequestItem } from '../components/browser/PullRequestItem';
+import * as samplePRs from './sample-responses/samplepr.json';
+
+// Unit tests for BrowserGroup
+describe('BrowserGroup', () => {
+  const DEFAULT_PROPS: IBrowserGroupProps = {
+    commands: {} as any,
+    docRegistry: {} as any,
+    group: { name: 'group1', pullRequests: (samplePRs as any).default },
+  };
+
+  // Test render
+  describe('#render()', () => {
+    it('should be a list item', () => {
+      const component = shallow(<BrowserGroup {...DEFAULT_PROPS} />);
+      expect(component.find('li')).toHaveLength(1);
+      expect(component.find('.jp-PullRequestBrowserGroup')).toHaveLength(1);
+    });
+
+    it('should have a header with text props.header', () => {
+      const component = shallow(<BrowserGroup {...DEFAULT_PROPS} />);
+      expect(component.find('header h2')).toHaveLength(1);
+      expect(component.contains([<h2>{DEFAULT_PROPS.group.name}</h2>])).toEqual(
+        true
+      );
+    });
+
+    it('should load group', () => {
+      const component = shallow(<BrowserGroup {...DEFAULT_PROPS} />);
+
+      expect(component.find('.jp-PullRequestBrowserGroupError')).toHaveLength(
+        0
+      );
+      expect(component.find('ul')).toHaveLength(1);
+      expect(component.find('.jp-PullRequestBrowserGroupList')).toHaveLength(1);
+    });
+
+    it('should load list item prs', () => {
+      const component = shallow(<BrowserGroup {...DEFAULT_PROPS} />);
+      expect(component.find(PullRequestItem)).toHaveLength(1);
+    });
+
+    it('should not have a group if there is an error', () => {
+      const component = shallow(
+        <BrowserGroup
+          {...DEFAULT_PROPS}
+          group={{
+            name: 'error',
+            pullRequests: [],
+            error: 'There is an error',
+          }}
+        />
+      );
+      expect(component.find('ul')).toHaveLength(0);
+      expect(component.find('.jp-PullRequestBrowserGroupList')).toHaveLength(0);
+    });
+
+    it('should display error if one exists', () => {
+      const error = 'There is an error';
+      const component = shallow(
+        <BrowserGroup
+          {...DEFAULT_PROPS}
+          group={{
+            name: 'error',
+            pullRequests: [],
+            error,
+          }}
+        />
+      );
+
+      expect(component.find('.jp-PullRequestBrowserGroupError')).toHaveLength(
+        1
+      );
+      expect(component.contains(error)).toEqual(true);
+    });
+  });
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ node_modules @@
     dist
     coverage
     **/*.d.ts
-    tests
+    lib