removed old test setup (#5070)

* removed ol dep * no build
fabricjs · Jun 26, 2018 · 4bb1ffb · 4bb1ffb
1 parent 9a734a3
commit 4bb1ffb
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 134 deletions.
diff --git a/package.json b/package.json
@@ -45,15 +45,14 @@
     "build:watch": "onchange 'src/**/**' 'HEADER.js' 'lib/**/**' -- npm run build_export",
     "build_with_gestures": "node build.js modules=ALL exclude=accessors",
     "build_export": "npm run build:fast && npm run export_dist_to_site",
-    "test": "node test.js",
-    "test:visual": "node test-visual.js",
+    "test": "istanbul cover ./node_modules/qunit/bin/qunit test/node_test_setup.js test/lib test/unit",
+    "test:visual": "./node_modules/qunit/bin/qunit test/node_test_setup.js test/lib test/visual",
     "test:all": "npm run test && npm run test:visual",
     "lint": "eslint --config .eslintrc.json src",
     "lint_tests": "eslint test/unit --config .eslintrc_tests",
     "export_dist_to_site": "cp dist/fabric.js ../fabricjs.com/lib/fabric.js && cp package.json ../fabricjs.com/lib/package.json && cp -r src HEADER.js lib ../fabricjs.com/build/files/",
     "export_tests_to_site": "cp test/unit/*.js ../fabricjs.com/test/unit",
     "all": "npm run build && npm run test && npm run lint && npm run lint_tests && npm run export_dist_to_site && npm run export_tests_to_site",
-    "test:node": "./node_modules/qunit/bin/qunit test/node_test_setup.js test/lib test/unit",
     "testem": "testem .",
     "testem:ci": "testem ci"
   },
@@ -65,7 +64,6 @@
   "devDependencies": {
     "eslint": "4.18.x",
     "istanbul": "0.4.x",
-    "node-qunit": "^1.0.0",
     "onchange": "^3.x.x",
     "qunit": "^2.4.1",
     "testem": "^1.18.4",

diff --git a/test.js b/test.js
diff --git a/test/fixtures/test_script.js b/test/fixtures/test_script.js
diff --git a/test/lib/canvas_assertions.js b/test/lib/canvas_assertions.js
diff --git a/test/node_test_setup.js b/test/node_test_setup.js
@@ -5,3 +5,4 @@ global.fs = require('fs');
 
 QUnit.config.testTimeout = 10000;
 QUnit.config.noglobals = true;
+QUnit.config.hidePassed = true;
diff --git a/testem.json b/testem.json
@@ -24,7 +24,7 @@
   ],
   "launchers": {
     "Node": {
-      "command": "npm run test:node",
+      "command": "npm run test",
       "protocol": "tap"
     }
   },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ global.fs = require('fs');

		QUnit.config.testTimeout = 10000;
		QUnit.config.noglobals = true;
		QUnit.config.hidePassed = true;