Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
9183ec5
Update CHANGELOG for 0.3.12.
Apr 8, 2017
317e7dd
0.3.12
Apr 8, 2017
3db5540
Improve ES7 error message
sukima Apr 21, 2017
f1ace81
Merge pull request #109 from sukima/sukima-patch-1
rwjblue Apr 21, 2017
168d052
add mocha support and fix pretender bug
Jun 1, 2017
aa09905
[Fixes #111] Update dependencies, get babel instrumenter working (#115)
paulcwatts Jun 14, 2017
2adeb4a
Merge remote-tracking branch 'upstream/master' into add-mocha-support
mgmarcum Jun 16, 2017
090b1ff
test
mgmarcum Jun 16, 2017
dbe0e6b
test
mgmarcum Jun 16, 2017
e2b6167
Merge branch 'add-mocha-support' of github.com:mattmarcum/ember-cli-c…
Jun 19, 2017
09b20ee
add mocha support and fix pretender bug
Jun 1, 2017
5438d01
Merge branch 'add-mocha-support' of github.com:mattmarcum/ember-cli-c…
Jun 21, 2017
d6cc166
0.4.0
Jun 27, 2017
c5715a5
update changelog v0.4.0
Jun 27, 2017
b9d52dc
Fixes the hanging issue of #88 (#90)
ming-codes Jun 27, 2017
808e206
0.4.1
Jun 27, 2017
4383719
update changelog v0.4.1
Jun 27, 2017
c6a085f
Suggest using `posttest` hook for `ember coverage-merge`
luketheobscure Jun 30, 2017
0c19ef7
Resolve addon file paths correctly in CLI >= 2.12
dfreeman Jun 30, 2017
db041be
Merge pull request #126 from luketheobscure/patch-1
Jun 30, 2017
2efe038
Spelling Fix
Aug 23, 2017
88ee657
Merge pull request #137 from darylalexjohnson/master
kategengler Aug 29, 2017
f025d5f
support nested coverageFolder
designblooz Jan 12, 2017
3a702aa
fix test
designblooz Sep 27, 2017
5155112
Merge pull request #93 from designblooz/nested-coverage-folder
RobbieTheWagner Sep 29, 2017
7f9b961
Merge pull request #119 from mattmarcum/add-mocha-support
RobbieTheWagner Sep 30, 2017
b712f85
Merge pull request #127 from dfreeman/fix-addon-paths
RobbieTheWagner Oct 1, 2017
c020a4a
Update minimum version of ember-cli-babel.
Oct 2, 2017
970ea20
Merge pull request #140 from rwjblue/bump-cli-babel-version
rwjblue Oct 2, 2017
44d083d
Add babel-plugin-istanbul dep.
Oct 2, 2017
6b5057c
Use babel-plugin-istanbul instead of custom instrumenter.
Oct 2, 2017
358652b
Refactor middleware to use new istanbul API.
Oct 2, 2017
1f2c10f
Refactor coverage-merge command to work with new istanbul-api.
Oct 2, 2017
3fb0ba5
Add node badge
RobbieTheWagner Oct 14, 2017
315814e
Merge pull request #142 from kategengler/rwwagner90-patch-1
Oct 14, 2017
be5b698
0.4.2
RobbieTheWagner Oct 16, 2017
4095a97
Fix paths for istanbul report and remove parallel logic for impicit p…
adamjmcgrath Nov 19, 2017
3b3a2fc
Delete uneeded files
adamjmcgrath Nov 19, 2017
cc12db2
Remove component fixtures and add tests for 'excludes' config
adamjmcgrath Dec 16, 2017
2b1c9fa
Add support for in-repo-addons #120
adamjmcgrath Dec 16, 2017
fbad578
Revert parallel changes (TODO: move to another PR)
adamjmcgrath Jan 15, 2018
9ee9309
Only include test fixtures when testing the addon.
adamjmcgrath Jan 15, 2018
76ee728
Add index.js unit tests
adamjmcgrath Jan 15, 2018
9a9a79f
Update some docs
adamjmcgrath Jan 15, 2018
47ee106
Add comment about .istanbul.yml to README
adamjmcgrath Jan 17, 2018
25704f6
Fix typo
adamjmcgrath Jan 17, 2018
2a81916
Merge pull request #145 from adamjmcgrath/spike-simpler-instrumentati…
RobbieTheWagner Jan 22, 2018
a0cf470
Bump ember, fix lint
RobbieTheWagner Jan 22, 2018
cf98c74
Merge pull request #141 from kategengler/spike-simpler-instrumentation
RobbieTheWagner Jan 22, 2018
0c0f7ed
Adjust some deps
RobbieTheWagner Jan 22, 2018
09b7d80
Bump ember-cli-release
RobbieTheWagner Jan 22, 2018
74eb5e1
Add ember-cli-changelog
RobbieTheWagner Jan 22, 2018
a8eed20
Released v1.0.0-beta.0
RobbieTheWagner Jan 22, 2018
046e445
Add back "Avoid throwing errors while requiring files for coverage" #64
adamjmcgrath Jan 24, 2018
d51a8cf
Merge pull request #153 from adamjmcgrath/warn-not-throw
kategengler Jan 31, 2018
0429711
Upgrade out-of-date deps
kategengler Jan 31, 2018
1724024
Update sinon
kategengler Jan 31, 2018
9998dac
Merge pull request #155 from kategengler/kg-upgrade-deps
kategengler Jan 31, 2018
f4734b7
Setup travis ci to release on pushed tag, add lerna-changelog
kategengler Feb 1, 2018
bd44ca6
Merge pull request #157 from kategengler/kg-release-process
kategengler Feb 1, 2018
e194f10
Add v1.0.0-beta.1 to CHANGELOG
kategengler Feb 1, 2018
d09214e
1.0.0-beta.1
kategengler Feb 1, 2018
c6c537e
Don't restrict travis to particular branches
kategengler Feb 1, 2018
c345a0e
Try using travis stages
kategengler Feb 1, 2018
eca2b62
Reformat .travis.yml and do not require sudo
kategengler Feb 1, 2018
3d3b005
Pin auto-dist-tag and add --no-sandbox to chrome args if on travis
kategengler Feb 1, 2018
6d1a928
Split out script for use with matrix build
kategengler Feb 1, 2018
619a333
Adjust deploy config
kategengler Feb 1, 2018
04a2c82
Make fixtures external (#156)
RobbieTheWagner Feb 2, 2018
6894236
Start in-repo addon tests (#158)
RobbieTheWagner Feb 6, 2018
bd7aa6b
Update CHANGELOG for v1.0.0-beta.2.
RobbieTheWagner Feb 6, 2018
63e2137
1.0.0-beta.2
RobbieTheWagner Feb 6, 2018
9c9a3c0
Support for addon-test-support (#160)
RobbieTheWagner Feb 9, 2018
46e6314
Add tests for in-repo engines (#162)
RobbieTheWagner Feb 12, 2018
b0b746e
Update CHANGELOG for v1.0.0-beta.3.
RobbieTheWagner Feb 13, 2018
fbee272
1.0.0-beta.3
RobbieTheWagner Feb 13, 2018
0592f5f
Remove merge-coverage and explicit parallel option (#163)
adamjmcgrath Feb 21, 2018
2a6ccb4
Revert "Remove merge-coverage and explicit parallel option (#163)"
adamjmcgrath Feb 27, 2018
36673f0
Keep implicit and explicit parallel logic
adamjmcgrath Mar 24, 2018
d234882
Merge pull request #166 from kategengler/revert-pr-163
kategengler Mar 24, 2018
b28deb5
Update babel-plugin-istanbul (#169)
charlesdemers Apr 4, 2018
77b5b92
Use the parent registry for determining JS extensions (#164)
dfreeman Apr 4, 2018
13fbbb4
Removing unused dependency exists-sync which fixes the deprecation wa…
selvaa89 Apr 25, 2018
5e439f5
Update CHANGELOG for v1.0.0-beta.4.
RobbieTheWagner Apr 26, 2018
ca8ffbb
1.0.0-beta.4
RobbieTheWagner Apr 26, 2018
309760b
Fix fileLookup is null in testemMiddleware (#182)
Gaurav0 Jun 2, 2018
81b5707
upgrade istanbul-api to 2.0.1 (#186)
lennyburdette Jun 25, 2018
06637de
Filter out in-repo addons that could not be found (#188)
jamescdavis Aug 15, 2018
359c844
Ember 3.4 (#190)
RobbieTheWagner Sep 8, 2018
df5a986
Bump deps (#191)
RobbieTheWagner Sep 9, 2018
d34fb24
Update CHANGELOG for v1.0.0-beta.5
RobbieTheWagner Sep 9, 2018
39772c7
1.0.0-beta.5
RobbieTheWagner Sep 9, 2018
1028657
Do not publish coverage, tests, or .idea to npm (#192)
RobbieTheWagner Sep 10, 2018
42476a4
Update babel-plugin-istanbul (#194)
RobbieTheWagner Sep 19, 2018
bd8220e
Update CHANGELOG for v1.0.0-beta.6
RobbieTheWagner Sep 19, 2018
ce128d5
1.0.0-beta.6
RobbieTheWagner Sep 19, 2018
5987f6c
TypeScript integration (howto) (#196)
lifeart Sep 21, 2018
59e6158
fix: handle babel 7 absolute paths (#199)
adamjmcgrath Sep 25, 2018
3440863
Merge branch 'master' of github.com:kategengler/ember-cli-code-covera…
NullVoxPopuli Oct 4, 2018
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
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

14 changes: 0 additions & 14 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
19 changes: 19 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
**/*{.,-}min.js

# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
138 changes: 47 additions & 91 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,100 +1,56 @@
/* jshint ignore:start */
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true,
node: true
browser: true
},
rules: {
// JSHint "expr"
'no-unused-expressions': [2, {
allowShortCircuit: true,
allowTernary: true,
}],

// JSHint "proto", disabled due to warnings
'no-proto': 0,

// JSHint "strict"
'strict': [2, 'global'],

// JSHint "indent", disabled due to warnings
'indent': [2, 2, {
'SwitchCase': 1,
'VariableDeclarator': { 'var': 2, 'let': 2, 'const': 3 }
}],

// JSHint "camelcase"
camelcase: 2,

// JSHint "boss"
'no-cond-assign': [2, 'except-parens'],

// JSHint "curly"
curly: 2,

// JSHint "latedef"
'no-use-before-define': [2, 'nofunc'],

// JSHint "debug", disabled already in .jshintrc
'no-debugger': 0,

// JSHint "eqeqeq"
eqeqeq: 2,

// JSHint "evil"
'no-eval': 2,

// JSHint "forin", disabled already in .jshintrc
'guard-for-in': 0,

// JSHint "immed", disabled already in .jshintrc
'wrap-iife': 0,

// JSHint "laxbreak"
'linebreak-style': [2, 'unix'],

// JSHint "newcap
'new-cap': [2, {
properties: false,
}],

// JSHint "noarg"
'no-caller': 2,

// JSHint "noempty", JSCS "disallowEmptyBlocks"
'no-empty': 2,

// JSHint "quotmark", disabled due to warnings
quotes: [0, 'single'],

// JSHint "nonew", disabled already in .jshintrc
'no-new': 0,

// JSHint "plusplus", disabled already in .jshintrc
'no-plusplus': 0,

// JSHint "undef"
'no-undef': 2,

// JSHint "unused"
'no-unused-vars': 2,

// JSHint "sub", disabled due to warnings
'dot-notation': 0,

// JSHint "trailing"
'no-trailing-spaces': 2,

// JSHint "eqnull"
'no-eq-null': 2,

'no-console': 0,
'comma-dangle': 0,
},
overrides: [
// node files
{
files: [
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/**',
'test/**',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'test/fixtures/**',
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
'no-console': 'off',
'no-useless-escape': 'off',
'node/no-unpublished-require': 'off'
})
}
]
};
/* jshint ignore:end */
22 changes: 14 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
45 changes: 30 additions & 15 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.eslintignore
/.eslintrc.js
/.gitignore
/.idea/
/.watchmanconfig
/.travis.yml
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.jshintrc
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/coverage/
/ember-cli-build.js
/testem.js
/test/
/tests/
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry=https://registry.npmjs.org/
2 changes: 1 addition & 1 deletion config/release.js → .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
publish: true
extends: 'recommended'
};
56 changes: 31 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
---
language: node_js
node_js:
- "0.12"
- "4.2"
- "6"
- "8"

sudo: false
dist: trusty
sudo: required

branches:
only:
- master
- auto
- /^greenkeeper.*$/
addons:
chrome: stable

cache:
directories:
- node_modules
yarn: true

env:
- NPM_SCRIPT=node-test
stages:
- lint
- test
- deploy

jobs:
fail_fast: true

matrix:
fast_finish: true
include:
- node_js: "6"
env: NPM_SCRIPT=lint
- stage: lint
script: npm run-script lint:js
- stage: deploy
if: tag IS present
node_js: "6"
install: yarn global add auto-dist-tag@0.1.5
script: auto-dist-tag --write
deploy:
provider: npm
email: katie@kmg.io
api_key:
secure: 1lwhuEjgX41j06ObP6VNIFXSWzTPylvG/iOa5BYdCmazFS5ry9d5CYBpTsGB6GhPfhPVYbrefwQSMerK7vzls6PfIxnSpGudIb48PGlHxZOlb5SQ/FOclWzwOylrCBSDWv0YRjlIkLkGf9VTo9zVBLvUWQs22ec40dVqcovj4Yy5YKRa2t3vLvOqV8KNx4n6AYmbSljZoJ6OePhSaYIwMYq56eBaphjumj7/cBShQ594azf0RBnvb2ILC2SixreiFTakThHAlNTbkIbMRdByzygZDTeZVLHoDaY5ZDmwBGP+SW25Qz6o2dLDAA5Xv4yhIGX4Zulai3nfhap0Jf65u/bGIK+4auZg1x0usjkewIqc8R7f+GKMjkhXCTA7bDtRmrkHA/WjdNiAXBaqRdFUwBaIJisL9RPpffgkgelMWHYwAH4R871pA0q8ebGsIY8KDsS0v6MeQT/jwCM4yVnNSYyJpLwIoZy0pLBII9rtdugEYL5wzBAfmmlBenyj5cYx/94bWw6R3aeZSEOTke8/JzzsH6dbjQEsPj21sHNS+DUCEdX5pX8xBWWDMsO/WBrzJptSXtyKdabnrpt2muF6VPUqHFGIlu/cS4RMswebJF160g3OhcFgSpbaXH60tKP2xIRzQx7KczL5+CM3E61XPsEyCfZ79KyUcr4zWJoS96Y=
on:
tags: true
repo: kategengler/ember-cli-code-coverage

before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm config set spin false
- npm install -g npm@^2
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- npm install -g bower
- npm install
- bower install
- yarn install --no-lockfile --non-interactive

script:
- npm run-script $NPM_SCRIPT
- npm run-script node-test
Loading