Merge pull request #10 from sandersky/master

Add code coverage

.travis.yml

@@ -6,10 +6,6 @@ sudo: false
 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-info-bar\/\(.*\)/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:

.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

bower.json

@@ -1,13 +1,10 @@
 {
   "name": "ember-frost-info-bar",
   "dependencies": {
-    "ember": "2.3.0",
+    "ember": "2.4.2",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "0.1.7",
-    "ember-resolver": "~0.1.20",
     "jquery": "2.1.4",
-    "loader.js": "ember-cli/loader.js#3.3.0",
     "blanket": "1.1.7",
     "bourbon": "4.2.6",
     "d3": "3.5.6",
@@ -20,6 +17,9 @@
     "sinonjs": "1.17.1"
   },
   "resolutions": {
-    "ember": "2.3.0"
+    "ember": "2.4.2"
+  },
+  "devDependencies": {
+    "blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26"
   }
 }

package.json

@@ -21,30 +21,31 @@
   "contributors": [],
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "2.2.0",
-    "ember-cli": "1.13.15",
+    "broccoli-asset-rev": "^2.4.2",
+    "ember-cli": "^2.4.2",
     "ember-cli-app-version": "1.0.0",
-    "ember-cli-blanket": "0.8.0",
+    "ember-cli-blanket": "0.9.1",
     "ember-cli-content-security-policy": "0.5.0",
-    "ember-cli-dependency-checker": "1.1.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars-inline-precompile": "0.3.1",
     "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "1.4.0",
     "ember-cli-mirage": "0.1.11",
-    "ember-cli-mocha": "0.10.0",
-    "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.3.0",
+    "ember-data": "^2.4.0",
     "ember-disable-proxy-controllers": "1.0.1",
     "ember-export-application-global": "1.0.4",
     "ember-frost-notifier": "^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": "1.10.3",
-    "eslint-config-frost-standard": "0.2.4"
+    "eslint": "2.2.0",
+    "eslint-config-frost-standard": "^1.0.0",
+    "loader.js": "^4.0.1"
   },
   "keywords": [
     "ember-addon",
@@ -59,7 +60,7 @@
     "ember-frost-button": "^1.0.0",
     "ember-frost-css-core": "^0.2.1",
     "ember-frost-icons": "^1.0.1",
-    "liquid-fire": "^0.22.0"
+    "liquid-fire": "^0.23.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.json

@@ -1,12 +1,12 @@
 {
   "framework": "mocha",
-  "test_page": "tests/index.html?coverage&hidepassed",
+  "test_page": "tests/index.html?hidepassed&coverage",
   "disable_watching": true,
   "launch_in_ci": [
-  "Firefox"
+    "Firefox"
   ],
   "launch_in_dev": [
-  "PhantomJS",
-  "Chrome"
+    "Firefox",
+    "Chrome"
   ]
 }

tests/blanket-options.js

@@ -7,8 +7,14 @@ var options = {
   loaderExclusions: [],
   enableCoverage: true,
   cliOptions: {
-    reporters: ['teamcity'],
-    autostart: true
+    reporters: ['lcov'],
+    autostart: true,
+    lcovOptions: {
+      outputFile: 'coverage/lcov.info',
+      renamer: function (fileName) {
+        return fileName.replace('ember-frost-info-bar', 'addon') + '.js'
+      }
+    }
   }
 }
 

tests/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ember-frost-info-bar tests</title>
+    <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

tests/unit/components/info-bar-test.js

@@ -0,0 +1,21 @@
+const expect = chai.expect
+
+import {describeComponent} from 'ember-mocha'
+import {beforeEach, it} from 'mocha'
+
+describeComponent(
+  'frost-info-bar',
+  'FrostInfoBarComponent',
+  {},
+  function () {
+    let component
+
+    beforeEach(function () {
+      component = this.subject()
+    })
+
+    it('includes className frost-info-bar', function () {
+      expect(component.classNames).to.include('frost-info-bar')
+    })
+  }
+)