From 4aa910cb1f6266c63e102cace9a9ad7fec44c9ac Mon Sep 17 00:00:00 2001 From: Matthew Dahl Date: Fri, 11 Mar 2016 10:53:24 -0800 Subject: [PATCH] Add code coverage --- .jshintrc | 36 ------------------------- .travis.yml | 11 ++------ .travis/publish-coverage.sh | 9 +++++++ bower.json | 14 ++++------ coverage/.gitkeep | 0 package.json | 26 +++++++++---------- testem.json | 11 ++++---- tests/.jshintrc | 52 ------------------------------------- tests/blanket-options.js | 11 ++++++-- 9 files changed, 43 insertions(+), 127 deletions(-) delete mode 100644 .jshintrc create mode 100755 .travis/publish-coverage.sh create mode 100644 coverage/.gitkeep delete mode 100644 tests/.jshintrc diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index ac75663..0000000 --- a/.jshintrc +++ /dev/null @@ -1,36 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise", - "d3" - ], - "browser": true, - "boss": true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esnext": true, - "unused": true, - "bitwise": false, - "jquery": true, - "latedef": true -} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index c927654..cd8a6cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,6 @@ node_js: branches: except: - /^v[0-9\.]+/ -cache: - directories: - - bower_components - - node_modules addons: apt: sources: @@ -19,7 +15,6 @@ addons: env: matrix: - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-1-13 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -29,9 +24,9 @@ env: matrix: fast_finish: true allow_failures: - - env: EMBER_TRY_SCENARIO=ember-1-13 - env: EMBER_TRY_SCENARIO=ember-canary before_install: +- npm config set spin false - npm install -g coveralls pr-bumper - pr-bumper check before_script: @@ -45,9 +40,7 @@ script: - npm run lint - ember try:one $EMBER_TRY_SCENARIO --- ember test after_success: -- sed -i -- 's/SF:ember-frost-scroll\/\(.*\)/SF:addon\/\1.js/' coverage/lcov.info - && rm -f coverage/lcov.info-- -- cat coverage/lcov.info | coveralls +- .travis/publish-coverage.sh before_deploy: - pr-bumper bump deploy: diff --git a/.travis/publish-coverage.sh b/.travis/publish-coverage.sh new file mode 100755 index 0000000..c5f60ff --- /dev/null +++ b/.travis/publish-coverage.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ "$EMBER_TRY_SCENARIO" != "default" ] +then + echo "Skipping coverage publish for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}" + exit 0 +fi + +cat coverage/lcov.info | coveralls diff --git a/bower.json b/bower.json index 8a111da..defbcad 100644 --- a/bower.json +++ b/bower.json @@ -1,14 +1,10 @@ { "name": "frost-scroll", "dependencies": { - "ember": "2.2.0", - "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", - "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3", - "ember-data": "2.2.0", - "ember-load-initializers": "0.1.7", - "ember-resolver": "~0.1.20", + "ember": "2.4.2", + "ember-cli-shims": "^0.1.0", + "ember-cli-test-loader": "^0.2.2", "jquery": "2.1.4", - "loader.js": "ember-cli/loader.js#3.4.0", "bourbon": "4.2.6", "ember-inflector": "1.3.1", "ember-mocha": "0.8.7", @@ -18,9 +14,9 @@ "pretender": "0.10.1" }, "resolutions": { - "ember": "2.2.0" + "ember": "2.4.2" }, "devDependencies": { - "blanket": "1.1.7" + "blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26" } } diff --git a/coverage/.gitkeep b/coverage/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/package.json b/package.json index cbaced8..998dfb0 100644 --- a/package.json +++ b/package.json @@ -26,32 +26,32 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.2.0", - "ember-cli": "1.13.13", + "ember-cli": "^2.4.2", "ember-cli-app-version": "^1.0.0", - "ember-cli-blanket": "0.6.2", - "ember-cli-content-security-policy": "0.4.0", + "ember-cli-blanket": "0.9.1", + "ember-cli-content-security-policy": "0.5.0", "ember-cli-dependency-checker": "^1.1.0", - "ember-cli-github-pages": "0.0.6", "ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-ic-ajax": "0.2.4", - "ember-cli-inject-live-reload": "1.3.1", + "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-mirage": "0.1.11", - "ember-cli-mocha": "0.9.7", - "ember-cli-notifications": "2.1.3", - "ember-cli-release": "0.2.8", - "ember-cli-sri": "^1.2.0", + "ember-cli-mocha": "0.10.1", + "ember-cli-notifications": "3.2.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "2.2.0", + "ember-data": "^2.4.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^1.0.4", "ember-frost-css-core": "1.0.0", "ember-frost-icons": "1.0.1", "ember-frost-theme": "1.0.1", + "ember-load-initializers": "^0.5.1", "ember-lodash": "^0.0.6", + "ember-resolver": "^2.0.3", "ember-truth-helpers": "^1.2.0", "ember-try": "^0.2.0", "eslint": "2.2.0", - "eslint-config-frost-standard": "^1.0.0" + "eslint-config-frost-standard": "^1.0.0", + "loader.js": "^4.0.1" }, "keywords": [ "ember-addon", @@ -60,8 +60,8 @@ "dependencies": { "ember-cli-babel": "^5.1.5", "ember-cli-htmlbars": "^1.0.1", - "ember-cli-sass": "5.1.0", - "ember-frost-icons": "1.0.1", + "ember-cli-sass": "^5.1.0", + "ember-frost-icons": "^1.0.1", "ember-frost-theme": "^1.0.0", "ember-frost-css-core": "^1.0.0" }, diff --git a/testem.json b/testem.json index 3757a59..ab848c3 100644 --- a/testem.json +++ b/testem.json @@ -2,12 +2,11 @@ "framework": "mocha", "test_page": "tests/index.html?hidepassed&coverage", "disable_watching": true, - "launch_in_dev": [ - "PhantomJS", - "Chrome" - ], "launch_in_ci": [ - "PhantomJS", "Firefox" + ], + "launch_in_dev": [ + "Firefox", + "Chrome" ] -} \ No newline at end of file +} diff --git a/tests/.jshintrc b/tests/.jshintrc deleted file mode 100644 index 6ec0b7c..0000000 --- a/tests/.jshintrc +++ /dev/null @@ -1,52 +0,0 @@ -{ - "predef": [ - "document", - "window", - "location", - "setTimeout", - "$", - "-Promise", - "define", - "console", - "visit", - "exists", - "fillIn", - "click", - "keyEvent", - "triggerEvent", - "find", - "findWithAssert", - "wait", - "DS", - "andThen", - "currentURL", - "currentPath", - "currentRouteName" - ], - "node": false, - "browser": false, - "boss": true, - "curly": true, - "debug": false, - "devel": false, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esnext": true, - "unused": true -} diff --git a/tests/blanket-options.js b/tests/blanket-options.js index e84d6fe..20b4a36 100644 --- a/tests/blanket-options.js +++ b/tests/blanket-options.js @@ -7,10 +7,17 @@ var options = { loaderExclusions: [], enableCoverage: true, cliOptions: { - reporters: ['json'], - autostart: true + reporters: ['lcov'], + autostart: true, + lcovOptions: { + outputFile: 'coverage/lcov.info', + renamer: function (fileName) { + return fileName.replace('ember-frost-scroll', 'addon') + '.js' + } + } } } + if (typeof exports === 'undefined') { blanket.options(options) } else {