Skip to content
This repository has been archived by the owner on Dec 26, 2017. It is now read-only.

Commit

Permalink
refactor(tests): Removed Karma for unit tests (#110)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonroberts authored Mar 14, 2017
1 parent 7aa2e00 commit 00a9c90
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 141 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Logs
logs
*.log
.nyc
.nyc_output

# Runtime data
pids
Expand Down Expand Up @@ -55,4 +57,4 @@ __build__/**
# Build Artifacts #
release
.ngc
*.ngfactory.ts
*.ngfactory.ts
6 changes: 6 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
machine:
node:
version: 6.9.5
test:
override:
- npm run build
84 changes: 0 additions & 84 deletions karma.conf.js

This file was deleted.

36 changes: 21 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"scripts": {
"karma": "karma start --single-run",
"test": "npm run karma",
"test": "nyc node tests.js",
"test:raw": "node tests.js",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"clean:pre": "rimraf release",
"clean:post": "rimraf src/**/*.ngfactory.ts",
Expand All @@ -33,14 +34,14 @@
],
"license": "MIT",
"peerDependencies": {
"rxjs": "^5.0.0-beta.12",
"@angular/core": "^2.0.0",
"@ngrx/store": "^1.5.0 || ^2.0.0"
"@ngrx/store": "^1.5.0 || ^2.0.0",
"rxjs": "^5.0.0-beta.12"
},
"devDependencies": {
"@angular/common": "^2.0.0",
"@angular/compiler": "^2.0.0",
"@angular/compiler-cli": "^0.6.1",
"@angular/compiler-cli": "^2.0.0",
"@angular/core": "^2.0.0",
"@angular/platform-browser": "^2.0.0",
"@angular/platform-browser-dynamic": "^2.0.0",
Expand All @@ -55,26 +56,31 @@
"core-js": "^2.2.2",
"cpy-cli": "^1.0.1",
"istanbul-instrumenter-loader": "^0.2.0",
"jasmine-core": "^2.5.0",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.3",
"karma-coverage": "^0.5.5",
"karma-jasmine": "^0.3.8",
"karma-mocha-reporter": "^2.0.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-typescript-preprocessor": "0.0.21",
"karma-webpack": "^1.7.0",
"jasmine": "^2.5.2",
"npm-run-all": "^1.7.0",
"nyc": "^8.3.2",
"reflect-metadata": "^0.1.3",
"rimraf": "^2.6.1",
"rollup": "^0.34.13",
"rxjs": "^5.0.0-beta.12",
"source-map-loader": "^0.1.5",
"ts-loader": "^0.8.2",
"ts-node": "^1.6.0",
"tslint": "^3.15.1",
"tslint-loader": "^2.1.5",
"typescript": "^2.0.2",
"uglifyjs": "^2.4.10",
"webpack": "^2.1.0-beta.21",
"zone.js": "^0.6.17"
"zone.js": "^0.7.2"
},
"nyc": {
"extension": [
".ts"
],
"exclude": [
"spec/**/*.spec"
],
"include": [
"src/**/*.ts"
]
}
}
38 changes: 0 additions & 38 deletions tests.bundle.ts

This file was deleted.

28 changes: 28 additions & 0 deletions tests.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
require('ts-node/register');
require('core-js/es7/reflect');
require('zone.js/dist/zone-node.js');
require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/proxy.js');
require('zone.js/dist/sync-test.js');
require('zone.js/dist/async-test.js');
require('zone.js/dist/fake-async-test.js');
const Jasmine = require('jasmine');

const runner = new Jasmine();

global.jasmine = runner.jasmine;

require('zone.js/dist/jasmine-patch.js');

const { getTestBed } = require('@angular/core/testing');
const { ServerTestingModule, platformServerTesting } = require('@angular/platform-server/testing');


getTestBed().initTestEnvironment(ServerTestingModule, platformServerTesting());

runner.loadConfig({
spec_dir: 'spec',
spec_files: [ '**/*.spec.ts' ]
});

runner.execute();
4 changes: 2 additions & 2 deletions tsconfig.dist.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

{
"compilerOptions": {
"baseUrl": ".",
Expand All @@ -21,6 +20,7 @@
"index.ts"
],
"angularCompilerOptions": {
"strictMetadataEmit": true
"strictMetadataEmit": true,
"genDir": "./release"
}
}
3 changes: 2 additions & 1 deletion tsconfig.testing.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"testing/index.ts"
],
"angularCompilerOptions": {
"strictMetadataEmit": true
"strictMetadataEmit": true,
"genDir": "./release"
}
}

0 comments on commit 00a9c90

Please sign in to comment.