Skip to content

Remove empty title tags in generated tests #2186

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

Merged
tlylt merged 14 commits into from
Mar 15, 2023
Merged

Remove empty title tags in generated tests #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fb07722
Prevent empty titles from being generated in siteData.json files
lhw-1 Feb 23, 2023
ff75956
Add default value for sites with no title
lhw-1 Feb 23, 2023
5055445
Remove unnecessary default setting
lhw-1 Feb 23, 2023
9ca6493
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Feb 25, 2023
b42e479
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Feb 27, 2023
e6bef1e
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Mar 2, 2023
d64edf3
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Mar 11, 2023
9c8c9db
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Mar 13, 2023
1fa159d
Remove empty title tags from generated pages
lhw-1 Mar 13, 2023
581485c
Remove empty titles from site config
lhw-1 Mar 13, 2023
dfb59dc
Remove unnecessary undefined check
lhw-1 Mar 13, 2023
055ae64
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Mar 14, 2023
f21583d
Merge branch 'master' into 2166-remove-empty-title
lhw-1 Mar 15, 2023
2b3180a
Remove unnecessary undefined
lhw-1 Mar 15, 2023
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: 0 additions & 3 deletions packages/cli/test/functional/test_site/expected/siteData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,18 @@
},
{
"src": "sub_site/index.md",
"title": "",
"headings": {
"feature-list": "Feature list"
},
"headingKeywords": {}
},
{
"src": "sub_site/nested_sub_site/index.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "test_md_fragment.md",
"title": "",
"headings": {
"some-heading": "Some heading"
},
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site/expected/sub_site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site/expected/test_md_fragment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...es/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...es/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...s/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3a.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...s/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3b.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_basic_convert/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
10 changes: 0 additions & 10 deletions packages/cli/test/functional/test_site_convert/test_basic_convert/expected/siteData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,67 +9,57 @@
},
{
"src": "Home.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "Page-1.md",
"title": "",
"headings": {
"page-1": "Page 1"
},
"headingKeywords": {}
},
{
"src": "_Footer.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "_Sidebar.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "about.md",
"title": "",
"headings": {
"about": "About"
},
"headingKeywords": {}
},
{
"src": "contents/topic1.md",
"title": "",
"headings": {
"topic-1": "Topic 1"
},
"headingKeywords": {}
},
{
"src": "contents/topic2.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "contents/topic3a.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "contents/topic3b.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "index.md",
"title": "",
"headings": {},
"headingKeywords": {}
}
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Page-1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/README.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...i/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...i/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion .../test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3a.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion .../test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3b.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
12 changes: 0 additions & 12 deletions ...ages/cli/test/functional/test_site_convert/test_navigation_convert/expected/siteData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,87 +9,75 @@
},
{
"src": "Home.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "Page-1.md",
"title": "",
"headings": {
"page-1": "Page 1"
},
"headingKeywords": {}
},
{
"src": "README.md",
"title": "",
"headings": {
"readme": "Readme"
},
"headingKeywords": {}
},
{
"src": "about.md",
"title": "",
"headings": {
"about": "About"
},
"headingKeywords": {}
},
{
"src": "contents/topic1.md",
"title": "",
"headings": {
"topic-1": "Topic 1"
},
"headingKeywords": {}
},
{
"src": "contents/topic2.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "contents/topic3a.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "contents/topic3b.md",
"title": "",
"headings": {},
"headingKeywords": {}
},
{
"src": "index.md",
"title": "",
"headings": {
"readme": "Readme"
},
"headingKeywords": {}
},
{
"src": "test_folder/extra_1.md",
"title": "",
"headings": {
"sample-content-in-another-folder-which-is-not-named-content": "Sample content in another folder which is not named content"
},
"headingKeywords": {}
},
{
"src": "test_folder/extra_2.md",
"title": "",
"headings": {
"sample-content-in-another-folder-which-is-not-named-content": "Sample content in another folder which is not named content"
},
"headingKeywords": {}
},
{
"src": "test_folder/extra_3.md",
"title": "",
"headings": {
"sample-content-in-another-folder-which-is-not-named-content": "Sample content in another folder which is not named content"
},
Expand Down
1 change: 0 additions & 1 deletion ...st/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...st/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
1 change: 0 additions & 1 deletion ...st/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 4.1.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/Page/PageConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class PageConfig {
* The source file's (.md) posix relative file path for rendering this page
*/
src: string;
title: string;
title?: string;
template: Template;
variableProcessor: VariableProcessor;
addressablePagesSource: string[];
Expand Down Expand Up @@ -106,7 +106,7 @@ export class PageConfig {
this.siteOutputPath = args.siteOutputPath;
this.sourcePath = args.sourcePath;
this.src = args.src;
this.title = args.title || '';
this.title = args.title;
this.template = args.template;
this.variableProcessor = args.variableProcessor;
this.addressablePagesSource = args.addressablePagesSource;
Expand Down
Loading