Merge pull request #9 from sandersky/master

Add code coverage
ciena-attic · Mar 10, 2016 · d1734ab · d1734ab
2 parents d704140 + cb48a08
commit d1734ab
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ branches:
   - "/^v[0-9\\.]+/"
 cache:
   directories:
-  - bower_components
   - node_modules
 addons:
   apt:
@@ -44,9 +43,7 @@ script:
 - npm run lint
 - ember try:one $EMBER_TRY_SCENARIO --- ember test
 after_success:
-- sed -i -- 's/SF:ember-frost-login\/\(.*\)/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
@@ -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
@@ -15,5 +15,8 @@
   },
   "resolutions": {
     "ember": "~2.3.0"
+  },
+  "devDependencies": {
+    "blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26"
   }
 }
diff --git a/coverage/.gitkeep b/coverage/.gitkeep
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "ember-ajax": "0.7.1",
     "ember-cli": "~2.3.0",
     "ember-cli-app-version": "^1.0.0",
+    "ember-cli-blanket": "0.9.1",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",

diff --git a/tests/blanket-options.js b/tests/blanket-options.js
@@ -0,0 +1,25 @@
+/* globals blanket, module */
+
+var options = {
+  modulePrefix: 'ember-frost-login',
+  filter: '//.*ember-frost-login/.*/',
+  antifilter: '//.*(tests|template).*/',
+  loaderExclusions: [],
+  enableCoverage: true,
+  cliOptions: {
+    reporters: ['lcov'],
+    autostart: true,
+    lcovOptions: {
+      outputFile: 'coverage/lcov.info',
+      renamer: function (fileName) {
+        return fileName.replace('ember-frost-login', 'addon') + '.js'
+      }
+    }
+  }
+}
+
+if (typeof exports === 'undefined') {
+  blanket.options(options)
+} else {
+  module.exports = options
+}
diff --git a/tests/index.html b/tests/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ember-frost-login tests</title>
+    <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
     <link rel="stylesheet" href="assets/test-support.css">
+    <style>#blanket-main { position: relative; z-index: 99999; }</style>
 
     {{content-for 'head-footer'}}
     {{content-for 'test-head-footer'}}
@@ -24,6 +25,8 @@
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
+    <script src="assets/blanket-options.js"></script>
+    <script src="assets/blanket-loader.js"></script>
     <script src="testem.js" integrity=""></script>
     <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>