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.

Sign up for GitHub

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

Jump to bottom

[BUGFIX] temporarily disable podModulePrefix deprecation #3565

Merged
merged 2 commits into from
Mar 24, 2015
Merged

[BUGFIX] temporarily disable podModulePrefix deprecation #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b81689c
temporarily disable podModulePrefix deprecation
trabus Mar 18, 2015
33836fd
bump bower.json ember-resolver to 0.1.15
trabus Mar 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion blueprints/app/files/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"jquery": "^1.11.1",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.16",
"ember-resolver": "~0.1.14",
"ember-resolver": "~0.1.15",
"loader.js": "ember-cli/loader.js#3.2.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
Expand Down
7 changes: 5 additions & 2 deletions lib/models/blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,10 +1287,13 @@ function hasPathToken(files) {
}

function podDeprecations(config, ui){
/*
var podModulePrefix = config.podModulePrefix || '';
var podPath = podModulePrefix.substr(podModulePrefix.lastIndexOf('/') + 1);
deprecateUI(ui)('`usePodsByDefault` is no longer supported in \'config/environment.js\','+
' use `usePods` in \'.ember-cli\' instead.', config.usePodsByDefault);
// Disabled until we are ready to deprecate podModulePrefix
deprecateUI(ui)('`podModulePrefix` is deprecated and will be removed from future versions of ember-cli.'+
' Please move existing pods from \'app/' + podPath + '/\' to \'app/\'.', config.podModulePrefix);
*/
deprecateUI(ui)('`usePodsByDefault` is no longer supported in \'config/environment.js\','+
' use `usePods` in \'.ember-cli\' instead.', config.usePodsByDefault);
}
3 changes: 2 additions & 1 deletion tests/acceptance/pods-destroy-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,8 @@ describe('Acceptance: ember destroy pod', function() {
});
});

it('podModulePrefix deprecation warning', function() {
// Skip until podModulePrefix is deprecated
it.skip('podModulePrefix deprecation warning', function() {
return destroyAfterGenerate(['controller', 'foo', '--pod']).then(function(result) {
expect(result.ui.output).to.include("`podModulePrefix` is deprecated and will be"+
" removed from future versions of ember-cli. Please move existing pods from"+
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/pods-generate-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,8 @@ describe('Acceptance: ember generate pod', function() {
});
});

it('podModulePrefix deprecation warning', function() {
// Skip until podModulePrefix is deprecated
it.skip('podModulePrefix deprecation warning', function() {
return generateWithPrefix(['controller', 'foo', '--pod']).then(function(result) {
expect(result.ui.output).to.include("`podModulePrefix` is deprecated and will be"+
" removed from future versions of ember-cli. Please move existing pods from"+
Expand Down