Skip to content
This repository was archived by the owner on Nov 25, 2018. It is now read-only.

Update everything#4

Merged
stefanpenner merged 7 commits intoember-cli:masterfrom
Turbo87:update
Mar 15, 2016
Merged

Update everything#4
stefanpenner merged 7 commits intoember-cli:masterfrom
Turbo87:update

Conversation

@Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Mar 8, 2016

see emberjs/ember.js#13029

resolves #3
resolves #2

@trabus
Copy link
Contributor

trabus commented Mar 8, 2016

Thank you for cleaning this up (and getting it over the finish line). Looking good.

@trabus
Copy link
Contributor

trabus commented Mar 8, 2016

@Turbo87 the travis failures may be related to ember-cli/ember-cli-blueprint-test-helpers#33

@Turbo87
Copy link
Member Author

Turbo87 commented Mar 8, 2016

haven't had time to investigate yet, but somethings wrong. it works on the emberjs PR, but I must've missed something here.

@Turbo87
Copy link
Member Author

Turbo87 commented Mar 9, 2016

@trabus it seems that indeed I have the same issue as in ember-cli/ember-cli-blueprint-test-helpers#33

@Turbo87
Copy link
Member Author

Turbo87 commented Mar 9, 2016

@rwjblue any idea how to avoid setting EMBER_DATA_SKIP_VERSION_CHECKING_DO_NOT_USE_THIS_ENV_VARIABLE=true?

@trabus
Copy link
Contributor

trabus commented Mar 9, 2016

@Turbo87 I would recommend that you remove ember-data from this lib, and add the blueprints directly. The intent of this addon was to provide a snapshot of the blueprints in ember-cli at the state where we diverged, providing backward-compatibility support for consumers that are not using addonified ember and ember-data versions.

@Turbo87
Copy link
Member Author

Turbo87 commented Mar 9, 2016

I tried removing the ember-data dependency but somehow Travis still failed with the same problem

@Turbo87 Turbo87 changed the title [WIP] Update everything Update everything Mar 15, 2016
@Turbo87
Copy link
Member Author

Turbo87 commented Mar 15, 2016

@stefanpenner @rwjblue @trabus I think this is ready for review and merging now

import Ember from 'ember';
import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';
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.

@trabus should these be absolute?

Copy link
Member Author

Choose a reason for hiding this comment

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

@stefanpenner
Copy link
Contributor

this looks good, i left one question. Then we can merge

stefanpenner added a commit that referenced this pull request Mar 15, 2016
@stefanpenner stefanpenner merged commit 2b24ea7 into ember-cli:master Mar 15, 2016
@Turbo87 Turbo87 deleted the update branch March 17, 2016 21:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Blueprints and Tests move tests to node-tests folder

3 participants