From 538ff88fb78aa2e54bef930cea05e99ad63350fd Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 17 Feb 2020 04:54:36 +0530 Subject: [PATCH 01/10] add _site to ignore list --- src/Site.js | 3 ++- src/constants.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Site.js b/src/Site.js index ba5c40f70b..5bc2f3b43c 100644 --- a/src/Site.js +++ b/src/Site.js @@ -52,6 +52,7 @@ const { SITE_ASSET_FOLDER_NAME, SITE_CONFIG_NAME, SITE_DATA_NAME, + SITE_FOLDER_NAME, TEMP_FOLDER_NAME, TEMPLATE_SITE_ASSET_FOLDER_NAME, USER_VARIABLES_PATH, @@ -427,7 +428,7 @@ class Site { globPages.concat(walkSync(this.rootPath, { directories: false, globs: [addressableGlob.glob], - ignore: [CONFIG_FOLDER_NAME], + ignore: [CONFIG_FOLDER_NAME, SITE_FOLDER_NAME], }).map(globPath => ({ src: globPath, searchable: addressableGlob.searchable, diff --git a/src/constants.js b/src/constants.js index 984667811b..276ec9fd29 100644 --- a/src/constants.js +++ b/src/constants.js @@ -39,6 +39,7 @@ module.exports = { CONFIG_FOLDER_NAME: '_markbind', HEADING_INDEXING_LEVEL_DEFAULT: 3, SITE_ASSET_FOLDER_NAME: 'asset', + SITE_FOLDER_NAME: '_site', TEMP_FOLDER_NAME: '.temp', TEMPLATE_SITE_ASSET_FOLDER_NAME: 'markbind', From 52e1afac3808880e8e4980e3ad886749907191ca Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 17 Feb 2020 06:14:30 +0530 Subject: [PATCH 02/10] update highlighted text bg color --- docs/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/css/main.css b/docs/css/main.css index 8f21f99265..92caaa36ed 100644 --- a/docs/css/main.css +++ b/docs/css/main.css @@ -1,5 +1,5 @@ mark { - background-color: rgba(255, 231, 2, 0.15); + background-color: #FFFF00; border-radius: 5px; padding-top: 0; padding-bottom: 0; From c493dbed739ccdfd8701ae0c45c6202eb5326314 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Wed, 25 Mar 2020 22:24:50 +0800 Subject: [PATCH 03/10] remove fixed bugs --- test/functional/test_site/bugs/index.md | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/test/functional/test_site/bugs/index.md b/test/functional/test_site/bugs/index.md index 995dd39721..b60876164d 100644 --- a/test/functional/test_site/bugs/index.md +++ b/test/functional/test_site/bugs/index.md @@ -5,29 +5,6 @@ header: header.md
-**popover initiated by trigger: honor trigger attribute** - -Issue #49 - -Repro: - -Establishing Requirements - - -
- -
- - -**Support multiple inclusions of a modal** - -Issue #107 - -Repro: - - - - **Remove extra space in links** Issue #147 From a7522050d7e7289c05b1e39ec1809dfe2530dde4 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Thu, 26 Mar 2020 03:08:45 +0800 Subject: [PATCH 04/10] add test file for modals --- test/functional/test_site/requirements/createModal.md | 3 +++ test/functional/test_site/testIncludeMultipleModals.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 test/functional/test_site/requirements/createModal.md create mode 100644 test/functional/test_site/testIncludeMultipleModals.md diff --git a/test/functional/test_site/requirements/createModal.md b/test/functional/test_site/requirements/createModal.md new file mode 100644 index 0000000000..a301a2d6a3 --- /dev/null +++ b/test/functional/test_site/requirements/createModal.md @@ -0,0 +1,3 @@ + + + diff --git a/test/functional/test_site/testIncludeMultipleModals.md b/test/functional/test_site/testIncludeMultipleModals.md new file mode 100644 index 0000000000..cdb2bc7341 --- /dev/null +++ b/test/functional/test_site/testIncludeMultipleModals.md @@ -0,0 +1,4 @@ +**Support Multiple Modals** + + + From 5f9b019aa24519022df91cd37ef03ffca94b7ea5 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Thu, 26 Mar 2020 03:25:07 +0800 Subject: [PATCH 05/10] add test for second bug --- test/functional/test_site/bugs/index.md | 10 ---------- test/functional/test_site/bugs/modal.md | 5 ----- test/functional/test_site/testTriggerAttributeHonor.md | 8 ++++++++ 3 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 test/functional/test_site/bugs/modal.md create mode 100644 test/functional/test_site/testTriggerAttributeHonor.md diff --git a/test/functional/test_site/bugs/index.md b/test/functional/test_site/bugs/index.md index b60876164d..470483739d 100644 --- a/test/functional/test_site/bugs/index.md +++ b/test/functional/test_site/bugs/index.md @@ -4,14 +4,4 @@ header: header.md
- -**Remove extra space in links** - -Issue #147 - -Repro: - -This is a link. -[[link text](https://github.com)] -
diff --git a/test/functional/test_site/bugs/modal.md b/test/functional/test_site/bugs/modal.md deleted file mode 100644 index 6a09255b1c..0000000000 --- a/test/functional/test_site/bugs/modal.md +++ /dev/null @@ -1,5 +0,0 @@ -This is to reproduce multiple inclusions of a modal bug - - - - diff --git a/test/functional/test_site/testTriggerAttributeHonor.md b/test/functional/test_site/testTriggerAttributeHonor.md new file mode 100644 index 0000000000..34e661d8a4 --- /dev/null +++ b/test/functional/test_site/testTriggerAttributeHonor.md @@ -0,0 +1,8 @@ +**Test Trigger Attribute is Honored** + + + popover +
+ User stories +
+ From a16f0bcc733a794f03470d874e3929b513cf31d6 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Thu, 26 Mar 2020 22:51:01 +0800 Subject: [PATCH 06/10] change functional testing description --- test/functional/test_site/requirements/createModal.md | 2 ++ test/functional/test_site/testIncludeMultipleModals.md | 2 +- test/functional/test_site/testTriggerAttributeHonor.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/functional/test_site/requirements/createModal.md b/test/functional/test_site/requirements/createModal.md index a301a2d6a3..f031fde0a3 100644 --- a/test/functional/test_site/requirements/createModal.md +++ b/test/functional/test_site/requirements/createModal.md @@ -1,3 +1,5 @@ + + diff --git a/test/functional/test_site/testIncludeMultipleModals.md b/test/functional/test_site/testIncludeMultipleModals.md index cdb2bc7341..b5295bac24 100644 --- a/test/functional/test_site/testIncludeMultipleModals.md +++ b/test/functional/test_site/testIncludeMultipleModals.md @@ -1,4 +1,4 @@ -**Support Multiple Modals** +**Multiple inclusions of a modal should be supported** diff --git a/test/functional/test_site/testTriggerAttributeHonor.md b/test/functional/test_site/testTriggerAttributeHonor.md index 34e661d8a4..79f0684b66 100644 --- a/test/functional/test_site/testTriggerAttributeHonor.md +++ b/test/functional/test_site/testTriggerAttributeHonor.md @@ -1,4 +1,4 @@ -**Test Trigger Attribute is Honored** +**Popover initiated by trigger should honor trigger attribute** popover From 776ff9c3f4838d5cd6e598529c3176ba1d3d79f9 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Thu, 26 Mar 2020 23:32:43 +0800 Subject: [PATCH 07/10] update test --- .../test_site/expected/bugs/index.html | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/test/functional/test_site/expected/bugs/index.html b/test/functional/test_site/expected/bugs/index.html index 8e21335fcf..81b442fd61 100644 --- a/test/functional/test_site/expected/bugs/index.html +++ b/test/functional/test_site/expected/bugs/index.html @@ -34,46 +34,7 @@
-
-

popover initiated by trigger: honor trigger attribute

-

Issue #49

-

Repro:

-

Establishing Requirements

- -
-
-

Requirements gathering, requirements elicitation, requirements analysis, -requirements capture are some of the terms commonly and interchangeably used to represent the activity -of understanding what a software product should do.

 -

Support multiple inclusions of a modal

-

Issue #107

-

Repro:

-
-

This is to reproduce multiple inclusions of a modal bug

- -
-

Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly and interchangeably used to represent the activity of understanding what a software product should - do. -

-
- -
-
-

This is to reproduce multiple inclusions of a modal bug

- -
-

Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly and interchangeably used to represent the activity of understanding what a software product should - do. -

-
- -
-

Remove extra space in links

-

Issue #147

-

Repro:

-

This is a link. [ - link text]

-
+