Merge branch 'dev' into brian/feature

Author: yangbrian310

src/app/components/Tutorial.tsx

@@ -11,13 +11,17 @@ import { faQuestion } from '@fortawesome/free-solid-svg-icons';
 import { tutorialSaveSeriesToggle, setCurrentTabInApp } from '../actions/actions';
 
 interface tutorialProps {
-  dispatch: unknown;
-  currentTabInApp: unknown;
+  dispatch: (object) => void;
+  currentTabInApp: string;
+}
+
+interface tutorialState {
+  stepsEnabled: boolean;
 }
 
 // This is the tutorial displayed when the "How to use" button is clicked
 // This needs to be a class component to be compatible with updateStepElement from intro.js
-export default class Tutorial extends React.Component<tutorialProps> {
+export default class Tutorial extends React.Component<tutorialProps, tutorialState> {
   constructor(props:tutorialProps) {
     super(props);
     this.state = {

src/backend/__tests__/linkFiber.test.tsx

@@ -10,9 +10,8 @@
 import React, { Component } from 'react';
 import { render } from 'react-dom';
 import linkFiberStart from '../linkFiber';
-// import 'expect-puppeteer';
-import puppeteer from 'puppeteer';
 
+const puppeteer = require('puppeteer');
 const SERVER = require('../puppeteerServer');
 
 // Apple uses port 5000 for Air Play.
@@ -24,15 +23,6 @@ let snapShot;
 
 let browser;
 let page;
-// interface Component {
-//   render(): any;
-//   context: any;
-//   setState: any;
-//   forceUpdate: any;
-//   props: any;
-//   state: any;
-//   refs: any;
-// }
 
 class App extends Component{
   state: { foo: string; };