Merge pull request #227 from WhitestormJS/#218

PR to Moves all existing tests close to src #218
WhitestormJS · Apr 1, 2017 · a455633 · a455633
2 parents 6306f7d + 36ececa
commit a455633
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/test/components.spec.js → src/components/__tests__/components.spec.js b/test/components.spec.js → src/components/__tests__/components.spec.js
@@ -1,4 +1,4 @@
-import * as WHS from '../src/index';
+import * as WHS from '../../index';
 import {Mesh} from 'three';
 
 const meshes = [

diff --git a/test/core/App.spec.js → src/core/__tests__/App.spec.js b/test/core/App.spec.js → src/core/__tests__/App.spec.js
@@ -1,4 +1,4 @@
-import * as WHS from '../../src/index';
+import * as WHS from '../../index';
 
 /*
  * Ignored methods:

diff --git a/test/core/Component.spec.js → src/core/__tests__/Component.spec.js b/test/core/Component.spec.js → src/core/__tests__/Component.spec.js
@@ -1,4 +1,4 @@
-import * as WHS from '../../src/index';
+import * as WHS from '../../index';
 
 /*
  * Ignored methods:

diff --git a/test/core/Loop.spec.js → src/core/__tests__/Loop.spec.js b/test/core/Loop.spec.js → src/core/__tests__/Loop.spec.js
@@ -1,4 +1,4 @@
-import * as WHS from '../../src/index';
+import * as WHS from '../index';
 
 const app = new WHS.App();
 const loop = new WHS.Loop(() => {}, false);

diff --git a/test/core/ModuleManager.spec.js → src/core/__tests__/ModuleManager.spec.js b/test/core/ModuleManager.spec.js → src/core/__tests__/ModuleManager.spec.js
@@ -1,4 +1,4 @@
-import * as WHS from '../../src/index';
+import * as WHS from '../../index';
 
 /*
  * Ignored methods:
@@ -41,7 +41,7 @@ test('.set()', () => {
  expect(manager.store.overwritable[0]).toBe('newValue');
 });
 
-test('.update()', async () => {
+test('.update()', () => {
  const update = new Promise((resolve, reject) => {
  manager.update({
  overwritable: () => {
@@ -54,7 +54,7 @@ test('.update()', async () => {
 
  manager.set('overwritable', 'check update');
 
- expect(await update).toBeTruthy();
+ expect(update).toBeTruthy();
 });
 
 test('.has()', () => {

diff --git a/test/modules.spec.js → src/modules/__tests__/modules.spec.js b/test/modules.spec.js → src/modules/__tests__/modules.spec.js
@@ -1,6 +1,6 @@
-import './polyfill';
-import * as WHS from '../src/index';
-import {FogModule} from '../src/modules/app/FogModule';
+import '../../polyfill';
+import * as WHS from '../../index';
+import {FogModule} from '../app/FogModule';
 import gl from 'gl';
 
 const app = new WHS.App();
@@ -40,7 +40,6 @@ test('VirtualMouseModule', () => {
  modules.mouse = new WHS.app.VirtualMouseModule();
 });
 
-
 // TODO move Modules tests into individual specs
 const defaultFog = new FogModule();
 test('FogModule', () => {

diff --git a/src/polyfill.js b/src/polyfill.js
@@ -1,3 +1,9 @@
+import present from 'present';
+
 export const system = {
  window: typeof window === 'undefined' ? global : window
 };
+
+global.performance = {
+ now: present
+};
diff --git a/test/polyfill.js b/test/polyfill.js