Skip to content

Commit

Permalink
Revert changes in to expected test files
Browse files Browse the repository at this point in the history
Previously in 8a5c42c we updated the test files
because we thought that the changes from #1116 were overwritten by later
PRs. However, it turned out that the local node modules was not updated after
pulling from master, hence the original changes were correct.

Let's revert the changes to the test files.
  • Loading branch information
Marvin Chin committed Apr 14, 2020
1 parent e5c70c2 commit 1e20737
Show file tree
Hide file tree
Showing 30 changed files with 407 additions and 261 deletions.
3 changes: 2 additions & 1 deletion test/functional/test_site/expected/bugs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<li><a class="nav-link" href="/test_site/bugs/index.html">Open Bugs</a></li>
</navbar>
<div class="bg-info display-4 text-center text-white">
<br> Test Jumbotron<br>
<br>
Test Jumbotron<br>
<br></div>
</header>
<div id="flex-body">
Expand Down
298 changes: 180 additions & 118 deletions test/functional/test_site/expected/index.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<strong>Non-Functional Requirements</strong> specify the constraints under which system is developed and operated.</p>
</div>
<p>
<seg id="preview">Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity of understanding what a software product should do.</seg>
<seg id="preview">Requirements gathering, requirements elicitation, requirements analysis,
requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
of understanding what a software product should do.</seg>
</p>
</seg>
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<h1 id="specifying-requirements">Specifying requirements<a class="fa fa-anchor" href="#specifying-requirements" onclick="event.stopPropagation()"></a></h1>
<p>
<seg id="preview">As we establish requirements, they should be recorded in some way for future reference, usually called a requirement specification. Furthermore, it is advisable to show these requirements to stakeholders, and refine requirements based on their feedback.
The next phase is to convert requirements into a product specification that specifies how the product will address the requirements. </seg>
<seg id="preview">As we establish requirements, they should be recorded in some way for future reference,
usually called a requirement specification. Furthermore, it is advisable to show these requirements to stakeholders,
and refine requirements based on their feedback. The next phase is to convert requirements into a product
specification that specifies how the product will address the requirements. </seg>
</p>
<p>Given next are some tools and techniques that can be used to specify requirements. Note that they can also be used for establishing requirements too.</p>
<p>Given next are some tools and techniques that can be used to specify requirements.
Note that they can also be used for establishing requirements too.</p>
<h2 id="textual-descriptions-unstructured-prose">Textual descriptions (unstructured prose)<a class="fa fa-anchor" href="#textual-descriptions-unstructured-prose" onclick="event.stopPropagation()"></a></h2>
<p>This is the most straight forward way of describing requirements. A textual description can be used to give a quick overview of the domain/system that is understandable to both the users and the development team. Textual descriptions are especially useful
when describing the vision of a product. However, lengthy textual descriptions are hard to follow.</p>
<p>This is the most straight forward way of describing requirements.
A textual description can be used to give a quick overview of the domain/system that is understandable to both
the users and the development team. Textual descriptions are especially useful when describing the vision of a product.
However, lengthy textual descriptions are hard to follow.</p>
<h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list" onclick="event.stopPropagation()"></a></h2>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority (e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related (e.g. order-related, invoice-related, etc.). Here is a sample feature
list from Minesweeper (only a brief description has been provided to save space).</p>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority
(e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related
(e.g. order-related, invoice-related, etc.).
Here is a sample feature list from Minesweeper (only a brief description has been provided to save space).</p>
<ol>
<li>Basic play – Single player play.</li>
<li>Difficulty levels – Additional Medium and Advanced levels.</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
<p>User stories are brief (typically, 1-3 sentences) descriptions of what the system can do for the users, written in the customers’ language. Often, user stories are written by the customers themselves.</p>
<p>User stories are brief (typically, 1-3 sentences) descriptions of what the system can do for the users,
written in the customers’ language. Often, user stories are written by the customers themselves.</p>
<p>A commonly used format for writing user stories is:<br>
<strong><code>As a</code></strong> <code>&lt;use type/role&gt;</code> <strong><code>I can</code></strong> <code>&lt;function&gt;</code> <strong><code>so that</code></strong> <code>&lt;benefit&gt;</code></p>
<p>Here are some examples of user stories for the IVLE system:</p>
<pre><code class="hljs bat"><span>* As a student, I can download files uploaded by lecturers, so that I can get my own <span class="hljs-built_in">copy</span> of the files.<br></span><span>* As a lecturer, I can create discussion forums, so that students can discuss things online.<br></span><span>* As a tutor, I can <span class="hljs-built_in">print</span> attendance sheets, so that I can take attendance during the class.<br></span></code></pre>
<p>The <code>&lt;benefit&gt;</code> can be omitted if it is obvious. E.g. As a tutor, I can print attendance sheets. User stories are mainly used for early estimation and scheduling purposes.</p>
<p>According to
<ref xp-website="">this
<ref></ref>, the biggest difference between user stories and traditional requirements specifications is in the level of detail. User stories should only provide enough detail to make a reasonably low risk estimate of how long the story will take to implement.
When the time comes to implement the story, the developers will meet with the customer face-to-face to work out a more detailed description of the requirements.</ref>
<p>The <code>&lt;benefit&gt;</code> can be omitted if it is obvious. E.g. As a tutor, I can print attendance sheets.
User stories are mainly used for early estimation and scheduling purposes.</p>
<p>According to <ref xp-website="">this<ref></ref>, the biggest difference between user stories and traditional requirements
specifications is in the level of detail. User stories should only provide enough detail to make a reasonably low risk
estimate of how long the story will take to implement. When the time comes to implement the story,
the developers will meet with the customer face-to-face to work out a more detailed description of the requirements.</ref>
</p>
<p>User stories are often written on index cards or sticky notes, and arranged on walls or tables to facilitate planning and discussion.</p>
<p>User stories are often written on index cards or sticky notes, and arranged on walls or tables to facilitate
planning and discussion.</p>
<p>
<seg xp-website="" sup=""><a href="http://www.extremeprogramming.org/rules/userstories.html">http://www.extremeprogramming.org/rules/userstories.html</a> This is the main website for eXtreme Programming (XP), an approach to software development currently popular among practitioners.
User stories are commonly used among XP practitioners to capture requirements.
<seg xp-website="" sup=""><a href="http://www.extremeprogramming.org/rules/userstories.html">http://www.extremeprogramming.org/rules/userstories.html</a>
This is the main website for eXtreme Programming (XP), an approach to software development currently popular
among practitioners. User stories are commonly used among XP practitioners to capture requirements.
</seg>
</p>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<div>
<p>Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity of understanding what a software product should do.</p>
<p>Requirements gathering, requirements elicitation, requirements analysis,
requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
of understanding what a software product should do.</p>
</div>
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<p>This is a page from another Markbind site.</p>
<h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list" onclick="event.stopPropagation()"></a></h2>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority (e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related (e.g. order-related, invoice-related, etc.). Here is a sample feature
list from Minesweeper (only a brief description has been provided to save space).</p>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority
(e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related
(e.g. order-related, invoice-related, etc.).
Here is a sample feature list from Minesweeper (only a brief description has been provided to save space).</p>
<ol>
<li>Basic play – Single player play.</li>
<li>Difficulty levels – Additional Medium and Advanced levels.</li>
Expand Down
6 changes: 4 additions & 2 deletions test/functional/test_site/expected/sub_site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
<div id="content-wrapper">
<p>This is a page from another Markbind site.</p>
<h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list" onclick="event.stopPropagation()"></a></h2>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority (e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related (e.g. order-related, invoice-related, etc.). Here is a sample
feature list from Minesweeper (only a brief description has been provided to save space).</p>
<p>It is a list of features (or functionalities) grouped according to some criteria such as priority
(e.g. must-have, nice-to-have, etc. ), order of delivery, object or process related
(e.g. order-related, invoice-related, etc.).
Here is a sample feature list from Minesweeper (only a brief description has been provided to save space).</p>
<ol>
<li>Basic play – Single player play.</li>
<li>Difficulty levels – Additional Medium and Advanced levels.</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<p>This is a page from another Markbind site. The purpose of this page is to ensure that reuse works as expected. All the following images should display correctly.</p>
<p>This is a page from another Markbind site.
The purpose of this page is to ensure that reuse works as expected.
All the following images should display correctly.</p>
<p>Some variables:</p>
<div></div>
<p>IMG tags:
Expand Down
26 changes: 20 additions & 6 deletions test/functional/test_site/expected/testAnchorGeneration.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@ <h3 id="should-have-anchor-3">should have anchor<a class="fa fa-anchor" href="#s
<h4 id="should-have-anchor-4">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-4" onclick="event.stopPropagation()"></a></h4>
<h5 id="should-have-anchor-5">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-5" onclick="event.stopPropagation()"></a></h5>
<h6 id="should-have-anchor-6">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-6" onclick="event.stopPropagation()"></a></h6>
<panel id="should-have-anchor-7"><template slot="_header"><h4 id="should-have-anchor-7">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-7" onclick="event.stopPropagation()"></a></h4></template> Lorem ipsum
<panel id="should-have-anchor-7"><template slot="_header">
<h4 id="should-have-anchor-7">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-7" onclick="event.stopPropagation()"></a></h4>
</template>
Lorem ipsum
</panel>
<panel><template slot="_header"><p>Collapsed</p></template>
<panel><template slot="_header">
<p>Collapsed</p>
</template>
<p>Headings in a collapsed-by-default panel should <strong>not</strong> have anchors</p>
<h1 id="should-not-have-anchor">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor" onclick="event.stopPropagation()"></a></h1>
<h2 id="should-not-have-anchor-2">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-2" onclick="event.stopPropagation()"></a></h2>
Expand All @@ -44,7 +49,9 @@ <h4 id="should-not-have-anchor-4">should not have anchor<a class="fa fa-anchor"
<h5 id="should-not-have-anchor-5">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-5" onclick="event.stopPropagation()"></a></h5>
<h6 id="should-not-have-anchor-6">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-6" onclick="event.stopPropagation()"></a></h6>
</panel>
<panel expanded=""><template slot="_header"><p>Expanded</p></template>
<panel expanded=""><template slot="_header">
<p>Expanded</p>
</template>
<p>Headings in a expanded-by-default panel <strong>should</strong> have anchors</p>
<h1 id="should-have-anchor-8">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-8" onclick="event.stopPropagation()"></a></h1>
<h2 id="should-have-anchor-9">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-9" onclick="event.stopPropagation()"></a></h2>
Expand All @@ -63,9 +70,14 @@ <h3 id="should-have-anchor-16">should have anchor<a class="fa fa-anchor" href="#
<h4 id="should-have-anchor-17">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-17" onclick="event.stopPropagation()"></a></h4>
<h5 id="should-have-anchor-18">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-18" onclick="event.stopPropagation()"></a></h5>
<h6 id="should-have-anchor-19">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-19" onclick="event.stopPropagation()"></a></h6>
<panel id="should-have-anchor-20"><template slot="_header"><h4 id="should-have-anchor-20">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-20" onclick="event.stopPropagation()"></a></h4></template> Lorem ipsum
<panel id="should-have-anchor-20"><template slot="_header">
<h4 id="should-have-anchor-20">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-20" onclick="event.stopPropagation()"></a></h4>
</template>
Lorem ipsum
</panel>
<panel><template slot="_header"><p>Collapsed</p></template>
<panel><template slot="_header">
<p>Collapsed</p>
</template>
<p>Headings in a collapsed-by-default panel should <strong>not</strong> have anchors</p>
<h1 id="should-not-have-anchor-7">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-7" onclick="event.stopPropagation()"></a></h1>
<h2 id="should-not-have-anchor-8">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-8" onclick="event.stopPropagation()"></a></h2>
Expand All @@ -74,7 +86,9 @@ <h4 id="should-not-have-anchor-10">should not have anchor<a class="fa fa-anchor"
<h5 id="should-not-have-anchor-11">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-11" onclick="event.stopPropagation()"></a></h5>
<h6 id="should-not-have-anchor-12">should not have anchor<a class="fa fa-anchor" href="#should-not-have-anchor-12" onclick="event.stopPropagation()"></a></h6>
</panel>
<panel expanded=""><template slot="_header"><p>Expanded</p></template>
<panel expanded=""><template slot="_header">
<p>Expanded</p>
</template>
<p>Headings in a expanded-by-default panel <strong>should</strong> have anchors</p>
<h1 id="should-have-anchor-21">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-21" onclick="event.stopPropagation()"></a></h1>
<h2 id="should-have-anchor-22">should have anchor<a class="fa fa-anchor" href="#should-have-anchor-22" onclick="event.stopPropagation()"></a></h2>
Expand Down
4 changes: 2 additions & 2 deletions test/functional/test_site/expected/testAntiFOUCStyles.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<div class="temp-dropdown-placeholder"></div>
<dropdown class="temp-dropdown">
<button slot="button" type="button" class="btn dropdown-toggle">
Test Two
<span class="caret"></span></button>
Test Two
<span class="caret"></span></button>
<li><a class="dropdown-item" href="/">Dropdown One</a></li>
<li><a class="dropdown-item" href="/">Dropdown Two</a></li>
</dropdown>
Expand Down
15 changes: 7 additions & 8 deletions test/functional/test_site/expected/testCodeBlocks.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,19 @@
<p><strong>Code block heading with inline markdown</strong></p>
<div class="code-block">
<div class="code-block-heading inline-markdown-heading"><span><strong>Bold</strong>, <em>Italic</em>, <em><strong>Bold and Italic</strong></em>, <s>Strike through</s>, <strong><strong>Super Bold</strong></strong>, <ins>Underline</ins>, <mark>Highlight</mark>, 👍 ❗️ ❌ 🚧<br>We support page breaks</span></div>
<div
class="code-block-content">
<div class="code-block-content">
<pre><code heading="**Bold**, _Italic_, ___Bold and Italic___, ~~Strike through~~, ****Super Bold****, ++Underline++, ==Highlight==, :+1: :exclamation: :x: :construction:&lt;br&gt;We support page breaks" class="hljs"><span>&lt;foo&gt;<br></span><span> &lt;bar&gt;<br></span><span>&lt;/foo&gt;<br></span></code></pre>
</div>
</div>
</div>
</div>


</div>
<footer>
<div class="text-center">
Default footer
</div>
</footer>
<footer>
<div class="text-center">
Default footer
</div>
</footer>
</div>
</body>
<script src="markbind/js/vue.min.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion test/functional/test_site/expected/testExternalScripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
<div id="content-wrapper">
<p>The external script <a href="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML">MathJax 2.75</a> should be included, and the following MathJax content should render:</p>
<box>
When \(a \ne 0\), there are two solutions to \(ax^2 + bx + c = 0\) and they are $$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$
When \(a \ne 0\), there are two solutions to \(ax^2 + bx + c = 0\) and they are
$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$
</box>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<div></div>
<p>Making sure the issue here <a href="https://github.com/MarkBind/markbind/commit/48b57a18a8bfd68101b163908da4a0541756364a">https://github.com/MarkBind/markbind/commit/48b57a18a8bfd68101b163908da4a0541756364a</a> is fixed.</p>
<div></div>
<p>Test import variables from src specified via variable: This variable comes from <a href="http://variablesToImport.md">variablesToImport.md</a></p>
<p>Test import variables from src specified via variable:
This variable comes from <a href="http://variablesToImport.md">variablesToImport.md</a></p>
<p>Test import variables that itself imports other variables:</p>
<h2 id="trying-to-access-a-page-variable">Trying to access a page variable:<a class="fa fa-anchor" href="#trying-to-access-a-page-variable" onclick="event.stopPropagation()"></a></h2>
<p>There should be something red below:</p>
Expand Down
Loading

0 comments on commit 1e20737

Please sign in to comment.