From a3ff1f72a2413ef23f446364f8cde4ed8a794408 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 27 Feb 2017 15:35:58 -0600 Subject: [PATCH 1/3] update to use lint from ember-test-utils --- .remarkrc | 11 +++++++++++ .travis.yml | 2 +- package.json | 14 +++----------- 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 .remarkrc diff --git a/.remarkrc b/.remarkrc new file mode 100644 index 0000000..dd36cbc --- /dev/null +++ b/.remarkrc @@ -0,0 +1,11 @@ +{ + "plugins": { + "lint": { + "list-item-indent": false, + "maximum-line-length": 119 + } + }, + "settings": { + "commonmark": true + } +} diff --git a/.travis.yml b/.travis.yml index c5d5bee..2968a7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ deploy: branch: master condition: "$EMBER_TRY_SCENARIO = 'default'" node: 'stable' - tags: false + tags: true after_deploy: - .travis/publish-gh-pages.sh notifications: diff --git a/package.json b/package.json index 082d18f..743a7fd 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,9 @@ }, "scripts": { "build": "ember build", + "lint": "lint-all-the-things", "start": "ember server", - "test": "npm run lint && COVERAGE=true ember test", - "eslint": "eslint *.js addon app config tests", - "sass-lint": "sass-lint -q -v", - "md-lint": "remark *.md", - "lint": "npm run eslint && npm run sass-lint && npm run md-lint" + "test": "npm run lint && COVERAGE=true ember test" }, "repository": "git@github.com:ciena-frost/ember-frost-navigation.git", "engines": { @@ -53,18 +50,13 @@ "ember-redux": "^1.0.0", "ember-resolver": "^2.0.3", "ember-sinon": "~0.5.0", - "ember-test-utils": "^1.8.0", + "ember-test-utils": "^1.10.7", "ember-truth-helpers": "1.2.0", - "eslint": "^3.0.0", - "eslint-config-frost-standard": "^4.0.0", "frost-guide-custom-routing": "0.0.4", "liquid-fire": "~0.26.0", "loader.js": "^4.0.1", "redux": "3.6.0", "redux-thunk": "2.1.0", - "remark-cli": "^2.0.0", - "remark-lint": "^5.1.0", - "sass-lint": "^1.0.0", "svg4everybody": "^2.1.0" }, "keywords": [ From cd64bcc2d7b4e107e88cb12310a976a2b7a2c25b Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 27 Feb 2017 16:34:59 -0600 Subject: [PATCH 2/3] update lint errors --- index.js | 1 + tests/integration/components/nav-action-test.js | 2 +- tests/integration/components/nav-route-test.js | 2 +- .../components/nav-section-actions-test.js | 2 +- tests/test-helper.js | 2 +- tests/unit/components/nav-action-test.js | 1 - tests/unit/components/nav-category-test.js | 1 - tests/unit/components/nav-modal-test.js | 3 +-- tests/unit/components/nav-route-test.js | 1 - tests/unit/components/nav-section-actions-test.js | 1 - tests/unit/components/nav-section-test.js | 3 +-- tests/unit/services/frost-navigation-test.js | 15 +++++++-------- 12 files changed, 14 insertions(+), 20 deletions(-) diff --git a/index.js b/index.js index 2fa8c3c..51f788a 100644 --- a/index.js +++ b/index.js @@ -12,6 +12,7 @@ module.exports = { if (this.options.babel.optional.indexOf('es7.decorators') === -1) { this.options.babel.optional.push('es7.decorators') } + // eslint-disable-next-line no-unused-expressions this._super.init && this._super.init.apply(this, arguments) }, included: function (app) { diff --git a/tests/integration/components/nav-action-test.js b/tests/integration/components/nav-action-test.js index e2a3a36..fa037f6 100644 --- a/tests/integration/components/nav-action-test.js +++ b/tests/integration/components/nav-action-test.js @@ -29,6 +29,6 @@ describe(test.label, function () { hook='nav-action' }}`) $hook('nav-action').click() - expect(nav.performAction.called).to.be.true + expect(nav.performAction.called).to.equal(true) }) }) diff --git a/tests/integration/components/nav-route-test.js b/tests/integration/components/nav-route-test.js index aa91dc3..d7d2a95 100644 --- a/tests/integration/components/nav-route-test.js +++ b/tests/integration/components/nav-route-test.js @@ -36,6 +36,6 @@ describe(test.label, function () { e({ctrlKey: true}), e() ].forEach(e => $hook('nav-route').trigger(e)) - expect(nav.dismiss.calledThrice).to.be.true + expect(nav.dismiss.calledThrice).to.equal(true) }) }) diff --git a/tests/integration/components/nav-section-actions-test.js b/tests/integration/components/nav-section-actions-test.js index f8055d7..4d6101e 100644 --- a/tests/integration/components/nav-section-actions-test.js +++ b/tests/integration/components/nav-section-actions-test.js @@ -18,6 +18,6 @@ describe(test.label, function () { this.set('goBack', spy) this.render(hbs`{{nav-section-actions goBack=goBack}}`) this.$('.nav-section-header').click() - expect(spy.called).to.be.true + expect(spy.called).to.equal(true) }) }) diff --git a/tests/test-helper.js b/tests/test-helper.js index 110ae91..7494206 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,4 +1,4 @@ import resolver from './helpers/resolver' -import { setResolver } from 'ember-mocha' +import {setResolver} from 'ember-mocha' setResolver(resolver) diff --git a/tests/unit/components/nav-action-test.js b/tests/unit/components/nav-action-test.js index c7ff20f..099dcd8 100644 --- a/tests/unit/components/nav-action-test.js +++ b/tests/unit/components/nav-action-test.js @@ -12,7 +12,6 @@ describe(test.label, function () { let component = this.subject() // renders the component on the page this.render() - expect(component).to.be.ok expect(component.getDefaultProps).to.be.a('array') expect(this.$()).to.have.length(1) }) diff --git a/tests/unit/components/nav-category-test.js b/tests/unit/components/nav-category-test.js index 116e13a..e3c1554 100644 --- a/tests/unit/components/nav-category-test.js +++ b/tests/unit/components/nav-category-test.js @@ -12,7 +12,6 @@ describe(test.label, function () { let component = this.subject() // renders the component on the page this.render() - expect(component).to.be.ok expect(component.getDefaultProps).to.be.a('array') expect(this.$()).to.have.length(1) diff --git a/tests/unit/components/nav-modal-test.js b/tests/unit/components/nav-modal-test.js index 0e21f90..134cbce 100644 --- a/tests/unit/components/nav-modal-test.js +++ b/tests/unit/components/nav-modal-test.js @@ -13,7 +13,6 @@ describe(test.label, function () { this.render() }) it('renders', function () { - expect(component).to.be.ok expect(this.$()).to.have.length(1) }) it('handles actions', function () { @@ -21,7 +20,7 @@ describe(test.label, function () { { name: 'setView', test () { - expect(component.get('showActions')).to.be.true + expect(component.get('showActions')).to.equal(true) } } ].forEach(e => { diff --git a/tests/unit/components/nav-route-test.js b/tests/unit/components/nav-route-test.js index 67f94de..713e942 100644 --- a/tests/unit/components/nav-route-test.js +++ b/tests/unit/components/nav-route-test.js @@ -12,7 +12,6 @@ describe(test.label, function () { let component = this.subject() // renders the component on the page this.render() - expect(component).to.be.ok expect(component.getDefaultProps).to.be.a('array') expect(this.$()).to.have.length(1) diff --git a/tests/unit/components/nav-section-actions-test.js b/tests/unit/components/nav-section-actions-test.js index e44b86a..dbe6165 100644 --- a/tests/unit/components/nav-section-actions-test.js +++ b/tests/unit/components/nav-section-actions-test.js @@ -13,7 +13,6 @@ describe(test.label, function () { // renders the component on the page component.set('goBack', function () {}) this.render() - expect(component).to.be.ok expect(this.$()).to.have.length(1) }) }) diff --git a/tests/unit/components/nav-section-test.js b/tests/unit/components/nav-section-test.js index 723cb4e..2d52dac 100644 --- a/tests/unit/components/nav-section-test.js +++ b/tests/unit/components/nav-section-test.js @@ -9,10 +9,9 @@ describe(test.label, function () { it('renders', function () { // creates the component instance - let component = this.subject() + this.subject() // renders the component on the page this.render() - expect(component).to.be.ok expect(this.$()).to.have.length(1) }) }) diff --git a/tests/unit/services/frost-navigation-test.js b/tests/unit/services/frost-navigation-test.js index c280d82..b3ed96d 100644 --- a/tests/unit/services/frost-navigation-test.js +++ b/tests/unit/services/frost-navigation-test.js @@ -1,5 +1,6 @@ import {expect} from 'chai' import Ember from 'ember' +const {A} = Ember import {setupTest} from 'ember-mocha' import {beforeEach, describe, it} from 'mocha' import sinon from 'sinon' @@ -13,18 +14,16 @@ describe('Unit / Service / frost-navigation', function () { beforeEach(function () { service = this.subject() }) - it('exists', function () { - expect(service).to.be.ok - }) it('adds categories correctly', function () { service._registerCategory({ name: 'add new category' }) - expect(service.categories).to.not.be.empty + console.log('service: ', service.categories.length) + expect(service.categories.length).to.equal(1) }) it('returns existing category', function () { let name = 'existing category' - service.set('categories', Ember.A()) + service.set('categories', A()) service.get('categories').pushObject({ name }) @@ -49,13 +48,13 @@ describe('Unit / Service / frost-navigation', function () { dismiss: true, action: 'testAction' }) - expect(spy.called).to.be.true - expect(service.get('_activeCategory')).to.be.null + expect(spy.called).to.equal(true) + expect(service.get('_activeCategory')).to.equal(null) }) it('transitions to a route', function () { let spy = sinon.spy() service.set('dismiss', spy) service.transitionTo('index') - expect(spy.called).to.be.true + expect(spy.called).to.equal(true) }) }) From 80cc1e2b6c983355598f031ca1e10d005603522f Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 28 Feb 2017 07:10:17 -0600 Subject: [PATCH 3/3] remove console.log used in debugging --- tests/unit/services/frost-navigation-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/services/frost-navigation-test.js b/tests/unit/services/frost-navigation-test.js index b3ed96d..11415f6 100644 --- a/tests/unit/services/frost-navigation-test.js +++ b/tests/unit/services/frost-navigation-test.js @@ -18,7 +18,6 @@ describe('Unit / Service / frost-navigation', function () { service._registerCategory({ name: 'add new category' }) - console.log('service: ', service.categories.length) expect(service.categories.length).to.equal(1) }) it('returns existing category', function () {