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

[CLEANUP] upgrade to ember-cli 2.18.0 #16085

Merged
merged 1 commit into from
Jan 7, 2018
Merged

[CLEANUP] upgrade to ember-cli 2.18.0 #16085

merged 1 commit into from
Jan 7, 2018

Conversation

GavinJoyce
Copy link
Member

@GavinJoyce GavinJoyce commented Jan 7, 2018

I'm unsure if there is a reason why we're using ember-cli 2.10.0 or not. This PR upgrades it to 2.18.0 if there isn't

@GavinJoyce
Copy link
Member Author

Seems to be failing due to a duplicate file:

screen shot 2018-01-07 at 19 57 55

@GavinJoyce
Copy link
Member Author

GavinJoyce commented Jan 7, 2018

ember new now creates an app/templates/application.hbs file which is causing ember generate route application to hang on an Overwrite app/templates/application.hbs prompt

@rwjblue
Copy link
Member

rwjblue commented Jan 7, 2018

We can probably avoid that by changing the name of the route we generate? I don't think that application was a terribly intentional choice...

@GavinJoyce
Copy link
Member Author

I think it was intentional, it seems to be testing that an application route isn't added to router.js:

it('route application', function() {
  return emberGenerate(['route', 'application']).then(() => {
    expect(file('app/router.js')).to.not.contain('this.route(\'application\')');
  });
});

@GavinJoyce
Copy link
Member Author

I'll just remove app/templates/application.hbs before running the command

@rwjblue
Copy link
Member

rwjblue commented Jan 7, 2018

Good idea 👍

@GavinJoyce
Copy link
Member Author

CI test failure seems to be flakiness

@rwjblue
Copy link
Member

rwjblue commented Jan 7, 2018

restarted browserstack

@rwjblue rwjblue merged commit d7b15ee into emberjs:master Jan 7, 2018
@GavinJoyce GavinJoyce deleted the gj/upgrade-ember-cli branch January 7, 2018 22:50
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.

3 participants