Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 46 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
build
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/

# Dependency directories
node_modules
typings
npm-debug.log
jspm_packages

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# IDEs
.vscode/
.idea/
85 changes: 0 additions & 85 deletions karma.conf.js

This file was deleted.

32 changes: 15 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
"homepage": "https://github.com/apollostack/angular2-apollo#readme",
"scripts": {
"pretest": "npm run build",
"test": "npm run test-ci",
"test": "npm run test-only",
"posttest": "npm run remap && npm run lint",
"test-ci": "karma start --browsers Firefox",
"test-only": "karma start",
"test-watch": "karma start --no-single-run",
"remap": "remap-istanbul -i coverage/coverage.json -t lcovonly -o coverage/lcov.info",
"test-only": "jest",
"test-watch": "jest --watch",
"remap": "remap-istanbul -i coverage/coverage-final.json -t lcovonly -o coverage/lcov.info",
"lint": "tslint -e src/*.ts && tslint tests/*.ts ",
"build": "tsc",
"watch": "tsc -w",
"clean": "rimraf build/* coverage/*",
"prepublish": "npm run clean && npm run build"
},
Expand All @@ -48,23 +46,15 @@
"@types/chai": "^3.4.33",
"@types/es6-shim": "^0.31.32",
"@types/isomorphic-fetch": "0.0.30",
"@types/jasmine": "^2.2.33",
"@types/jest": "^15.1.32",
"@types/lodash": "^4.14.34",
"@types/node": "^6.0.38",
"apollo-client": "^0.5.0",
"es6-shim": "^0.35.0",
"ghooks": "^1.2.1",
"graphql": "^0.7.0",
"graphql-tag": "^0.1.9",
"istanbul-instrumenter-loader": "^1.0.0",
"jasmine": "^2.4.1",
"jasmine-core": "^2.4.1",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-firefox-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-webpack": "^1.7.0",
"jest": "^16.0.2",
"reflect-metadata": "^0.1.8",
"remap-istanbul": "^0.7.0",
"rimraf": "^2.5.2",
Expand All @@ -73,12 +63,20 @@
"typed-graphql": "^1.0.1",
"typescript": "^2.0.0",
"validate-commit-msg": "^2.6.1",
"webpack": "^1.13.0",
"zone.js": "^0.6.23"
},
"config": {
"ghooks": {
"commit-msg": "validate-commit-msg"
}
},
"jest": {
"moduleFileExtensions": ["js"],
"testRegex": "\\.spec\\.js$",
"testPathDirs": ["<rootDir>/build/tests"],
"browser": true,
"collectCoverage": true,
"coverageDirectory": "coverage",
"coverageReporters": ["json"]
}
}
2 changes: 2 additions & 0 deletions tests/Angular2Apollo.ts → tests/Angular2Apollo.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import './_common';

import { ReflectiveInjector } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { RxObservableQuery } from 'apollo-client-rxjs';
Expand Down
2 changes: 2 additions & 0 deletions tests/SelectPipe.ts → tests/SelectPipe.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import './_common';

import { SelectPipe } from '../src';

describe('SelectPipe', () => {
Expand Down
1 change: 1 addition & 0 deletions tests/_common.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'reflect-metadata';
7 changes: 0 additions & 7 deletions tests/index.ts

This file was deleted.

3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"files": [
"typings.d.ts",
"src/index.ts",
"tests/index.ts"
"tests/Angular2Apollo.spec.ts",
"tests/SelectPipe.spec.ts"
]
}
Loading