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

Add {{page-title}} to route templates #19224

Merged
merged 1 commit into from
Oct 24, 2020
Merged

Add {{page-title}} to route templates #19224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion blueprints/route/files/__root__/__templatepath__/__templatename__.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{{outlet}}
<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Syntax is like this to keep whitespace consistent.

<%}%>{{outlet}}
6 changes: 5 additions & 1 deletion blueprints/route/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,17 @@ module.exports = useEditionDetector({

locals: function (options) {
let moduleName = options.entity.name;
let rawRouteName = moduleName.split('/').pop();
let emberPageTitleExists = 'ember-page-title' in options.project.dependencies();

if (options.resetNamespace) {
moduleName = moduleName.split('/').pop();
moduleName = rawRouteName;
}

return {
moduleName: stringUtil.dasherize(moduleName),
routeName: stringUtil.classify(rawRouteName),
addTitle: emberPageTitleExists,
};
},

Expand Down
3 changes: 2 additions & 1 deletion blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{{outlet}}
<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
<%}%>{{outlet}}
94 changes: 94 additions & 0 deletions node-tests/blueprints/route-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,24 @@ describe('Blueprint: route', function () {
});
});
});

describe('ember-page-title is installed', function () {
beforeEach(function () {
return modifyPackages([{ name: 'ember-page-title', dev: true }]);
});

it('route foo', function () {
return emberGenerateDestroy(['route', 'foo'], (_file) => {
expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
});
});

it('route foo/bar', function () {
return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
});
});
});
});

describe('in addon', function () {
Expand Down Expand Up @@ -462,6 +480,24 @@ describe('Blueprint: route', function () {
expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
});
});

describe('ember-page-title is installed', function () {
beforeEach(function () {
return modifyPackages([{ name: 'ember-page-title', dev: true }]);
});

it('route foo', function () {
return emberGenerateDestroy(['route', 'foo'], (_file) => {
expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
});
});

it('route foo/bar', function () {
return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
});
});
});
});

describe('in app - octane', function () {
Expand Down Expand Up @@ -719,6 +755,24 @@ describe('Blueprint: route', function () {
});
});
});

describe('ember-page-title is installed', function () {
beforeEach(function () {
return modifyPackages([{ name: 'ember-page-title', dev: true }]);
});

it('route foo', function () {
return emberGenerateDestroy(['route', 'foo'], (_file) => {
expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
});
});

it('route foo/bar', function () {
return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
});
});
});
});

describe('in addon - octane', function () {
Expand Down Expand Up @@ -907,6 +961,24 @@ describe('Blueprint: route', function () {
expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
});
});

describe('ember-page-title is installed', function () {
beforeEach(function () {
return modifyPackages([{ name: 'ember-page-title', dev: true }]);
});

it('route foo', function () {
return emberGenerateDestroy(['route', 'foo'], (_file) => {
expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
});
});

it('route foo/bar', function () {
return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
});
});
});
});

describe('in in-repo-addon', function () {
Expand Down Expand Up @@ -984,5 +1056,27 @@ describe('Blueprint: route', function () {
);
});
});

describe('ember-page-title is installed', function () {
beforeEach(function () {
return modifyPackages([{ name: 'ember-page-title', dev: true }]);
});

it('route foo', function () {
return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
'{{page-title "Foo"}}\n{{outlet}}'
);
});
});

it('route foo/bar', function () {
return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal(
'{{page-title "Bar"}}\n{{outlet}}'
);
});
});
});
});
});