Revert "Merge pull request #29252 from code-dot-org/vanilla-chai-else…

…where"

This reverts commit 0216190, reversing
changes made to 8fdebf0.

apps/test/unit/SoundsTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../util/configuredChai';
 import Sounds from '@cdo/apps/Sounds';
 import sinon from 'sinon';
 

apps/test/unit/achievementsTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../util/configuredChai';
 import * as achievements from '@cdo/apps/achievements';
 import sinon from 'sinon';
 import authoredHintUtils from '@cdo/apps/authoredHintUtils';

apps/test/unit/applab/AppLabCrosshairOverlayTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import React from 'react';
 import {shallow} from 'enzyme';

apps/test/unit/applab/AppLabTooltipOverlayTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import React from 'react';
 import {mount, shallow} from 'enzyme';

apps/test/unit/applab/CompletionButtonTest.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {mount} from 'enzyme';
 import {UnconnectedCompletionButton as CompletionButton} from '@cdo/apps/templates/CompletionButton';
 

apps/test/unit/applab/ImportProjectDialogTest.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import sinon from 'sinon';
 import {shallow} from 'enzyme';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {ImportProjectDialog} from '@cdo/apps/applab/ImportProjectDialog';
 import {
   sources as sourcesApi,

apps/test/unit/applab/ScreenSelectorTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import React from 'react';
 import {mount} from 'enzyme';
 import {

apps/test/unit/applab/applabTest.js

@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import sinon from 'sinon';
-import {assert, expect} from 'chai';
+import {assert, expect} from '../../util/configuredChai';
 import project from '@cdo/apps/code-studio/initApp/project';
 import i18n from '@cdo/apps/code-studio/i18n';
 import commonMsg from '@cdo/locale';

apps/test/unit/applab/commandsTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 import {rgb, setSelectionRange, openUrl} from '@cdo/apps/applab/commands';
 import {injectErrorHandler} from '@cdo/apps/lib/util/javascriptMode';

apps/test/unit/applab/designElements/dropdownTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import dropdown from '@cdo/apps/applab/designElements/dropdown';
 import library from '@cdo/apps/applab/designElements/library';
 

apps/test/unit/applab/designElements/elementUtilsTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 
 import * as elementUtils from '@cdo/apps/applab/designElements/elementUtils';
 

apps/test/unit/applab/designElements/labelTest.js

@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import label from '@cdo/apps/applab/designElements/label';
 import library from '@cdo/apps/applab/designElements/library';
 import * as applabConstants from '@cdo/apps/applab/constants';

apps/test/unit/applab/designModeTest.js

@@ -1,4 +1,4 @@
-import {expect} from '../../util/reconfiguredChai';
+import {expect} from '../../util/configuredChai';
 import designMode from '@cdo/apps/applab/designMode';
 import elementLibrary from '@cdo/apps/applab/designElements/library';
 

apps/test/unit/applab/dropletConfigTest.js

@@ -1,5 +1,5 @@
 /** @file Test applab droplet config behavior */
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {blocks} from '@cdo/apps/applab/dropletConfig';
 
 describe(`Applab droplet configuration`, () => {

apps/test/unit/applab/getListDropdownTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 
 var getListDropdown = require('@cdo/apps/applab/getListDropdown');
 

apps/test/unit/applab/importTest.js

@@ -1,6 +1,6 @@
 /* eslint no-unused-vars: "error" */
 import sinon from 'sinon';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {allowConsoleErrors} from '../../util/testUtils';
 import designMode from '@cdo/apps/applab/designMode';
 import * as elementUtils from '@cdo/apps/applab/designElements/elementUtils';

apps/test/unit/applab/redux/applabTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for App Lab redux module */
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import {
   getStore,
   registerReducers,

apps/test/unit/applab/redux/screensTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import {allowConsoleErrors} from '../../../util/testUtils';
 import sinon from 'sinon';
 

apps/test/unit/authoredHintsTest.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import {expect} from 'chai';
+import {expect} from '../util/configuredChai';
 
 import * as utils from '@cdo/apps/utils';
 import AuthoredHints from '@cdo/apps/authoredHints';

apps/test/unit/clientApiTest.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import {expect, assert} from 'chai';
+import {expect, assert} from '../util/configuredChai';
 const project = require('@cdo/apps/code-studio/initApp/project');
 var clientApi = require('@cdo/apps/clientApi');
 

apps/test/unit/craft/code-connection/ccTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import sinon from 'sinon';
 import {singleton as studioApp} from '@cdo/apps/StudioApp';
 import {executeUserCode} from '@cdo/apps/craft/code-connection/craft';

apps/test/unit/craft/code-connection/utilsTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 import {parseElement} from '@cdo/apps/xml';
 import {convertBlocksXml} from '@cdo/apps/craft/code-connection/utils';
 

apps/test/unit/dance/reducersTest.js

@@ -1,5 +1,5 @@
 var createStore = require('../../util/redux').createStore;
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {reducers, setSelectedSong} from '../../../src/dance/redux';
 var testUtils = require('../../util/testUtils');
 var commonReducers = require('@cdo/apps/redux/commonReducers');

apps/test/unit/dropletUtilsTest.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import {assert, expect} from 'chai';
+import {assert, expect} from '../util/configuredChai';
 import sinon from 'sinon';
 import * as testUtils from './../util/testUtils';
 import * as dropletUtils from '@cdo/apps/dropletUtils';

apps/test/unit/gamelab/AnimationPicker/AnimationPickerBodyTest.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {shallow} from 'enzyme';
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 const gamelabMsg = require('@cdo/gamelab/locale');
 import {
   WarningLabel,

apps/test/unit/gamelab/AnimationPicker/animationPickerModuleTest.js

@@ -1,5 +1,5 @@
 import reducer, * as animationPickerModule from '@cdo/apps/gamelab/AnimationPicker/animationPickerModule';
-import {expect} from 'chai';
+import {expect} from '../../../util/configuredChai';
 var Goal = animationPickerModule.Goal;
 
 describe('animationPickerModule', function() {

apps/test/unit/gamelab/AnimationTabTest.js

@@ -1,5 +1,5 @@
 var animationTabModule = require('@cdo/apps/gamelab/AnimationTab/animationTabModule');
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 
 describe('AnimationTab', function() {
   describe('reducer', function() {

apps/test/unit/gamelab/ErrorDialogStackTest.js

@@ -1,5 +1,5 @@
 var errorDialogStackModule = require('@cdo/apps/gamelab/errorDialogStackModule');
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {UnconnectedErrorDialogStack as ErrorDialogStack} from '@cdo/apps/gamelab/ErrorDialogStack';
 import {mount} from 'enzyme';
 import React from 'react';

apps/test/unit/gamelab/ExporterTest.js

@@ -1,4 +1,4 @@
-import {assert, expect} from 'chai';
+import {assert, expect} from '../../util/configuredChai';
 import sinon from 'sinon';
 
 var testUtils = require('../../util/testUtils');

apps/test/unit/gamelab/GameLabGroupTest.js

@@ -1,6 +1,6 @@
 /** @file Tests for GameLabGroup, our extension of p5.play Group */
 import {spy} from 'sinon';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {createStatefulGameLabP5} from '../../util/gamelab/TestableGameLabP5';
 import {sandboxDocumentBody} from '../../util/testUtils';
 

apps/test/unit/gamelab/GameLabP5Test.js

@@ -1,6 +1,6 @@
 /** @file Test of our p5.play wrapper object */
 import {spy} from 'sinon';
-import {assert, expect} from 'chai';
+import {assert, expect} from '../../util/configuredChai';
 import createGameLabP5 from '../../util/gamelab/TestableGameLabP5';
 import {sandboxDocumentBody} from '../../util/testUtils';
 

apps/test/unit/gamelab/GameLabSpriteTest.js

@@ -1,6 +1,6 @@
 /* @file Test of our p5.play Sprite wrapper object */
 /* global p5 */
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {
   forEveryBooleanPermutation,
   sandboxDocumentBody

apps/test/unit/gamelab/GameLabTest.js

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom';
 import sinon from 'sinon';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import GameLab from '@cdo/apps/gamelab/GameLab';
 import Sounds from '@cdo/apps/Sounds';
 import {

apps/test/unit/gamelab/PropTypesTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {throwIfSerializedAnimationListIsInvalid} from '@cdo/apps/gamelab/shapes';
 
 var testUtils = require('../../util/testUtils');

apps/test/unit/gamelab/animationListModuleTest.js

@@ -18,7 +18,7 @@ import reducer, {
 import animationTab from '@cdo/apps/gamelab/AnimationTab/animationTabModule';
 import {EMPTY_IMAGE} from '@cdo/apps/gamelab/constants';
 import {createStore} from '../../util/redux';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {setExternalGlobals} from '../../util/testUtils';
 import commonReducers from '@cdo/apps/redux/commonReducers';
 import {setPageConstants} from '@cdo/apps/redux/pageConstants';

apps/test/unit/gamelab/blocksTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {sprites} from '@cdo/apps/gamelab/blocks';
 import {
   registerReducers,

apps/test/unit/gamelab/reducersTest.js

@@ -5,7 +5,7 @@ var {
 } = require('@cdo/apps/gamelab/textConsoleModule');
 var createStore = require('../../util/redux').createStore;
 var combineReducers = require('redux').combineReducers;
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 var _ = require('lodash');
 var GameLabInterfaceMode = require('@cdo/apps/gamelab/constants')
   .GameLabInterfaceMode;

apps/test/unit/gamelab/shapesTest.js

@@ -1,5 +1,5 @@
 import {throwIfSerializedAnimationListIsInvalid} from '@cdo/apps/gamelab/shapes';
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 
 describe('GameLab Shapes', function() {
   const propsByKeyOneItem = {

apps/test/unit/gamelab/stateQueriesTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for Game Lab helper methods that make decisions based on redux state */
-import {expect} from 'chai';
+import {expect} from '../../util/configuredChai';
 import {forEveryBooleanPermutation} from '../../util/testUtils';
 import {
   allowAnimationMode,

apps/test/unit/lib/kits/maker/ButtonTest.js

@@ -1,6 +1,6 @@
 /** @file Tests for our johnny-five Button wrapper */
 import _ from 'lodash';
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import five from '@code-dot-org/johnny-five';
 import makeStubBoard from './makeStubBoard';
 import Button from '@cdo/apps/lib/kits/maker/Button';

apps/test/unit/lib/kits/maker/CircuitPlaygroundBoardTest.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import sinon from 'sinon';
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {EventEmitter} from 'events'; // see node-libs-browser
 import Playground from 'playground-io';
 import five from '@code-dot-org/johnny-five';

apps/test/unit/lib/kits/maker/FakeBoardTest.js

@@ -1,6 +1,6 @@
 import {itImplementsTheMakerBoardInterface} from './MakerBoardTest';
 import FakeBoard from '@cdo/apps/lib/kits/maker/FakeBoard';
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 
 describe('FakeBoard', () => {
   itImplementsTheMakerBoardInterface(FakeBoard);

apps/test/unit/lib/kits/maker/LedTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for our johnny-five Led wrapper */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import five from '@code-dot-org/johnny-five';
 import makeStubBoard from './makeStubBoard';

apps/test/unit/lib/kits/maker/MakerBoardTest.js

@@ -1,7 +1,7 @@
 /** @file Exports a set of tests that verify the MakerBoard interface */
 import sinon from 'sinon';
 import {EventEmitter} from 'events'; // see node-libs-browser
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {N_COLOR_LEDS} from '@cdo/apps/lib/kits/maker/PlaygroundConstants';
 
 /**

apps/test/unit/lib/kits/maker/MakerErrorTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for our MakerError classes */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import MakerError, {
   ConnectionFailedError,
   wrapKnownMakerErrors

apps/test/unit/lib/kits/maker/NeoPixelTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for our johnny-five Led.RGB wrapper */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import five from '@code-dot-org/johnny-five';
 import NeoPixel from '@cdo/apps/lib/kits/maker/NeoPixel';

apps/test/unit/lib/kits/maker/PiezoTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for our johnny-five Piezo wrapper */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import five from '@code-dot-org/johnny-five';
 import Piezo from '@cdo/apps/lib/kits/maker/Piezo';

apps/test/unit/lib/kits/maker/PlaygroundComponentsTest.js

@@ -2,7 +2,7 @@
 import five from '@code-dot-org/johnny-five';
 import Playground from 'playground-io';
 import {EventEmitter} from 'events'; // provided by webpack's node-libs-browser
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import {
   createCircuitPlaygroundComponents,

apps/test/unit/lib/kits/maker/SwitchTest.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import {EventEmitter} from 'events'; // provided by webpack's node-libs-browser
 import Switch, {

apps/test/unit/lib/kits/maker/ThermometerTest.js

@@ -1,5 +1,5 @@
 /** @file Test the Thermometer controller wrapping playground-io Thermometer */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import Thermometer from '@cdo/apps/lib/kits/maker/Thermometer';
 import Playground from 'playground-io';

apps/test/unit/lib/kits/maker/TouchSensorTest.js

@@ -1,5 +1,5 @@
 /** @file Test the TouchSensor maker component which wraps Touchpad */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import {EventEmitter} from 'events'; // provided by webpack's node-libs-browser
 import TouchSensor from '@cdo/apps/lib/kits/maker/TouchSensor';

apps/test/unit/lib/kits/maker/commandsTest.js

@@ -1,5 +1,5 @@
 /** @file Test maker command behavior */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import sinon from 'sinon';
 import {
   analogRead,

apps/test/unit/lib/kits/maker/dropletConfigTest.js

@@ -1,5 +1,5 @@
 /** @file Test maker droplet config behavior */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {
   blocks,
   getBoardEventDropdownForParam,

apps/test/unit/lib/kits/maker/portScanningTest.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {
   CIRCUIT_PLAYGROUND_PORTS,
   CIRCUIT_PLAYGROUND_EXPRESS_PORTS,

apps/test/unit/lib/kits/maker/reduxTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for Maker Toolkit redux module */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {createStore, combineReducers} from 'redux';
 import {
   reducer,

apps/test/unit/lib/kits/maker/toolkitTest.js

@@ -1,5 +1,5 @@
 /** @file Tests for toolkit.js - Maker's main export */
-import {expect} from 'chai';
+import {expect} from '../../../../util/configuredChai';
 import {
   stubRedux,
   restoreRedux,