Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Ember CLI 2.16.2 #503

Merged
merged 46 commits into from
Oct 18, 2017
Merged

Conversation

juwara0
Copy link
Contributor

@juwara0 juwara0 commented Oct 17, 2017

This project uses semver, please check the scope of this pr:

  • #none# - documentation fixes and/or test additions
  • #patch# - backwards-compatible bug fix
  • #minor# - adding functionality in a backwards-compatible manner
  • #major# - incompatible API change

CHANGELOG

@@ -523,7 +529,7 @@ export default Component.extend({

case TAB:
this.get('onClose')()
return
return // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will open an issue for us to refactor this code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue opened to track this: #506

@@ -1,6 +1,5 @@
/* global $ */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove and import from jquery?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -0,0 +1,21 @@
import destroyApp from '../helpers/destroy-app'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need this file, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@@ -14,14 +13,14 @@ describe(test.label, function () {
beforeEach(function () {
component = this.subject({
_setupAssertions: function () {
return
return // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const spyOn = sinon.spy($.fn, 'on')
const spyOff = sinon.spy($.fn, 'off')

component.set('onScrollUp', function () { return })
component.set('onScrollUp', function () { return }) // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const spyOn = sinon.spy($.fn, 'on')
const spyOff = sinon.spy($.fn, 'off')

component.set('onScrollLeft', function () { return })
component.set('onScrollLeft', function () { return }) // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const spyOn = sinon.spy($.fn, 'on')
const spyOff = sinon.spy($.fn, 'off')

component.set('onMouseEnter', function () { return })
component.set('onMouseEnter', function () { return }) // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const spyOn = sinon.spy($.fn, 'on')
const spyOff = sinon.spy($.fn, 'off')

component.set('onScrollRight', function () { return })
component.set('onScrollRight', function () { return }) // eslint-disable-line no-useless-return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the return

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -1,19 +1,19 @@
const consumer = require('../../../../lib/utils/consumer')
const expect = require('chai').expect
// const consumer = require('../../../../lib/utils/consumer')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get rid of the file instead of commenting out? Or use .skip()?

})
})
})
// const expect = require('chai').expect
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get rid of the file instead of commenting out? Or use .skip()?

@notmessenger
Copy link
Contributor

notmessenger commented Oct 18, 2017

👍

Approved with PullApprove

@juwara0 juwara0 merged commit 5e8bcad into ciena-frost:master Oct 18, 2017
@juwara0 juwara0 deleted the upgradeEmberCli_2-16-2 branch October 18, 2017 15:13
@juwara0
Copy link
Contributor Author

juwara0 commented Oct 18, 2017

It was necessary to temporarily not run ember-try scenario ember-lts-2.12 due to an issue in CI. An issue was opened to track this: #505

notmessenger added a commit to notmessenger/ember-frost-core that referenced this pull request Nov 2, 2017
…li_2-16-2"

This reverts commit 5e8bcad, reversing
changes made to e1255c0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Travis and yarn issue on Ember 2.12 only
2 participants