Skip to content

Commit

Permalink
Fix broken functional test
Browse files Browse the repository at this point in the history 
Commit 0efb692 introduced a new page structure for generated MarkBind
websites, and also have additional styles to support the new Holy Grail
layout.

These changes are not reflected in the new test site
'test_site_algolia_plugin' created in 5fcd5ba.

Let's update the expected test files for 'test_site_algolia_plugin' to
incorporate the new changes and fix the broken test.
  • Loading branch information
@yamgent
yamgent committed Mar 30, 2019
1 parent 5fcd5ba commit 03263c5
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 191 deletions.
219 changes: 107 additions & 112 deletions test/functional/test_site_algolia_plugin/expected/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,135 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 1.22.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hello World</title>
<link rel="stylesheet" href="markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="markbind/css/bootstrap-vue.min.css">
<link rel="stylesheet" href="markbind/fontawesome/css/all.min.css" >
<link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css" >
<link rel="stylesheet" href="markbind/css/github.min.css">
<link rel="stylesheet" href="markbind/css/markbind.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css">
<link rel="stylesheet" href="markbind/layouts/default/styles.css">
<link rel="stylesheet" href="markbind/css/site-nav.css">

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="MarkBind 1.22.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hello World</title>
<link rel="stylesheet" href="markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="markbind/css/bootstrap-vue.min.css">
<link rel="stylesheet" href="markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="markbind/css/github.min.css">
<link rel="stylesheet" href="markbind/css/markbind.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css">
<link rel="stylesheet" href="markbind/layouts/default/styles.css">
<link rel="stylesheet" href="markbind/css/site-nav.css">



</head>

<body>
<div id="app">
<div id="app">
<div id="flex-body">
<div id="site-nav">
<ul style="list-style-type: none; margin-left:-1em">
<li style="margin-top: 10px"><a href="/test_site_algolia_plugin/index.html" class="site-nav__a current">Home <span aria-hidden="true" class="glyphicon glyphicon-home"></span></a></li>
</ul>
</div>
<div id="site-nav-btn-wrap">
<div id="site-nav-btn">
<div class="menu-top-bar"></div>
<div class="menu-middle-bar"></div>
<div class="menu-bottom-bar"></div>
</div>
</div>
<div id="page-content">
<div id="content-wrapper">
<h1 id="test-algolia-plugin-adds-algolia-no-index-classes">Test Algolia plugin adds algolia-no-index classes<a class="fa fa-anchor" href="#test-algolia-plugin-adds-algolia-no-index-classes"></a></h1>
<h2 id="dropdowns-should-have-algolia-no-index-class">Dropdowns should have algolia-no-index class<a class="fa fa-anchor" href="#dropdowns-should-have-algolia-no-index-class"></a></h2>
<div class="temp-dropdown-placeholder">Dropdown</div>
<dropdown text="Dropdown" class="temp-dropdown algolia-no-index">
<li><a class="dropdown-item" href="/">One</a></li>
<li><a class="dropdown-item" href="/">Two</a></li>
</dropdown>
<h2 id="modals-should-have-algolia-no-index-class">Modals should have algolia-no-index class<a class="fa fa-anchor" href="#modals-should-have-algolia-no-index-class"></a></h2>
<modal title="Modal" id="modal:trigger_id" class="algolia-no-index">
Content
</modal>
<trigger for="modal:trigger_id">Trigger</trigger>
<h2 id="panels-that-are-not-expanded-should-have-algolia-no-index-class">Panels that are not expanded should have algolia-no-index class<a class="fa fa-anchor" href="#panels-that-are-not-expanded-should-have-algolia-no-index-class"></a></h2>
<panel header="Panel" class="algolia-no-index">
Content
</panel>
<panel header="Panel" expanded="">
Content
</panel>
<h2 id="popover-should-have-algolia-no-index-class">Popover should have algolia-no-index class<a class="fa fa-anchor" href="#popover-should-have-algolia-no-index-class"></a></h2>
<popover effect="fade" content="Content" placement="top" class="algolia-no-index">
<button class="btn btn-secondary">Popover</button></popover>
<h2 id="tabs-except-first-tab-should-have-algolia-no-index-class">Tabs except first tab should have algolia-no-index class<a class="fa fa-anchor" href="#tabs-except-first-tab-should-have-algolia-no-index-class"></a></h2>
<tabs>
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tabs>
<tabs>
<tab-group header="First Group">
<nav id="site-nav" class="navbar navbar-light bg-transparent">
<div class="sticky-top spacer-top viewport-height-90 scrollable slim-scroll">
<ul class="px-3 site-nav-list">
<li class="mt-2"><a href="/test_site_algolia_plugin/index.html" class="site-nav__a current">Home <span aria-hidden="true" class="glyphicon glyphicon-home"></span></a></li>
</ul>
</div>
</nav>
<div id="content-wrapper">
<h1 id="test-algolia-plugin-adds-algolia-no-index-classes">Test Algolia plugin adds algolia-no-index classes<a class="fa fa-anchor" href="#test-algolia-plugin-adds-algolia-no-index-classes"></a></h1>
<h2 id="dropdowns-should-have-algolia-no-index-class">Dropdowns should have algolia-no-index class<a class="fa fa-anchor" href="#dropdowns-should-have-algolia-no-index-class"></a></h2>
<div class="temp-dropdown-placeholder">Dropdown</div>
<dropdown text="Dropdown" class="temp-dropdown algolia-no-index">
<li><a class="dropdown-item" href="/">One</a></li>
<li><a class="dropdown-item" href="/">Two</a></li>
</dropdown>
<h2 id="modals-should-have-algolia-no-index-class">Modals should have algolia-no-index class<a class="fa fa-anchor" href="#modals-should-have-algolia-no-index-class"></a></h2>
<modal title="Modal" id="modal:trigger_id" class="algolia-no-index">
Content
</modal>
<trigger for="modal:trigger_id">Trigger</trigger>
<h2 id="panels-that-are-not-expanded-should-have-algolia-no-index-class">Panels that are not expanded should have algolia-no-index class<a class="fa fa-anchor" href="#panels-that-are-not-expanded-should-have-algolia-no-index-class"></a></h2>
<panel header="Panel" class="algolia-no-index">
Content
</panel>
<panel header="Panel" expanded="">
Content
</panel>
<h2 id="popover-should-have-algolia-no-index-class">Popover should have algolia-no-index class<a class="fa fa-anchor" href="#popover-should-have-algolia-no-index-class"></a></h2>
<popover effect="fade" content="Content" placement="top" class="algolia-no-index">
<button class="btn btn-secondary">Popover</button></popover>
<h2 id="tabs-except-first-tab-should-have-algolia-no-index-class">Tabs except first tab should have algolia-no-index class<a class="fa fa-anchor" href="#tabs-except-first-tab-should-have-algolia-no-index-class"></a></h2>
<tabs>
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
<tab-group header="Second Group" class="algolia-no-index">
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
</tabs>
<tabs>
<tab-group header="First Group">
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
<tab-group header="Second Group" class="algolia-no-index">
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
</tabs>
<tabs>
<tab-group header="Outer One">
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
<tab header="Outer Two" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
</tabs>
<tabs>
<tab-group header="Outer One">
<tab header="First Tab">
Content<br>Content<br>Content<br>Content
</tab>
<tab header="Second Tab" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tab-group>
<tab header="Outer Two" class="algolia-no-index">
Content<br>Content<br>Content<br>Content
</tab>
</tabs>
<h2 id="tooltip-should-have-algolia-no-index-class">Tooltip should have algolia-no-index class<a class="fa fa-anchor" href="#tooltip-should-have-algolia-no-index-class"></a></h2>
<tooltip header="" content="Content" placement="top" class="algolia-no-index">
<button class="btn btn-secondary">Tooltip</button></tooltip>
</tabs>
<h2 id="tooltip-should-have-algolia-no-index-class">Tooltip should have algolia-no-index class<a class="fa fa-anchor" href="#tooltip-should-have-algolia-no-index-class"></a></h2>
<tooltip header="" content="Content" placement="top" class="algolia-no-index">
<button class="btn btn-secondary">Tooltip</button></tooltip>
</div>
</div>
<footer>
<div class="text-center">
This is a dynamic height footer that supports markdown <span>😄</span>!
</div>
</footer>
</div>
</div>
<div id="flex-div"></div>
<footer>
<div class="text-center">
This is a dynamic height footer that supports markdown <span>😄</span>!
</div>
</footer>
</div>
</body>
<script src="markbind/js/vue.min.js"></script>
<script src="markbind/js/vue-strap.min.js"></script>
<script src="markbind/js/bootstrap-utility.min.js"></script>
<script src="markbind/js/polyfill.min.js"></script>
<script src="markbind/js/bootstrap-vue.min.js"></script>
<script>
const baseUrl = '/test_site_algolia_plugin'
const enableSearch = true
const baseUrl = '/test_site_algolia_plugin'
const enableSearch = true
</script>
<script src="markbind/js/setup.js"></script>
<script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
<script>
function initAlgolia() {
docsearch({
apiKey: "25626fae796133dc1e734c6bcaaeac3c",
indexName: "docsearch",
inputSelector: "#algolia-search-input",
algoliaOptions: {},
debug: false,
});
}
MarkBind.afterSetup(initAlgolia);
</script>
function initAlgolia() {
docsearch({
apiKey: "25626fae796133dc1e734c6bcaaeac3c",
indexName: "docsearch",
inputSelector: "#algolia-search-input",
algoliaOptions: {},
debug: false,
});
}
MarkBind.afterSetup(initAlgolia);
</script>
<script src="markbind/layouts/default/scripts.js"></script>
</html>

</html>
65 changes: 46 additions & 19 deletions test/functional/test_site_algolia_plugin/expected/markbind/css/markbind.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,57 @@ code.hljs.inline {
background-color: #fff;
}

/**
* Holy Grail Layout
*
* This section covers the common styles used within Header, Footer and Side Navigation bars
*/

/* #app is treated as the main container */
#app {
display: flex;
flex-direction: column;
min-height: 100vh;
}

#flex-body {
display: flex;
flex: 1;
}

#content-wrapper {
flex: 1;
margin: 0 auto;
max-width: 1000px;
overflow-x: hidden;
padding: 0 20px;
transition: 0.4s;
width: 100%;
-webkit-transition: 0.4s;
}

/* Footer */
footer {
background-color: #f5f5f5;
color: dimgrey;
padding: 10px 0;
}

/* Side Navigation menus */

.spacer-top {
/*
spacer-top class is a work around for MarkBind <navbar> component using "position: fixed".
This class can be removed once the component's position type is changed.
*/
padding-top: 70px;
}

.scrollable {
overflow-y: auto;
}

.viewport-height-90 {
max-height: 90vh;
}

/* Bootstrap small(sm) responsive breakpoint */
Expand Down Expand Up @@ -111,24 +156,6 @@ code.hljs.inline {
}
}

/* Footer */

footer {
background-color: #f5f5f5;
color: dimgrey;
padding: 10px 0;
}

#app {
display: flex;
flex-direction: column;
min-height: 100vh;
}

#flex-div {
flex: 1;
}

/* Scrollbar */

.slim-scroll::-webkit-scrollbar {
Expand Down
33 changes: 15 additions & 18 deletions test/functional/test_site_algolia_plugin/expected/markbind/css/page-nav.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

#page-nav {
border-left: solid 1px lightgrey;
display: inline-block;
max-height: 80vh;
overflow: auto;
position: fixed;
right: 0;
display: block;
flex: 0 0 auto;
max-width: 300px;
transition: 0.4s;
width: 300px;
-webkit-transition: 0.4s;
Expand All @@ -27,13 +25,20 @@
color: black;
}

#page-nav-content-wrapper {
margin-right: 300px;
transition: 0.4s;
-webkit-transition: 0.4s;
.page-nav-title {
color: black;
white-space: inherit;
}

/* Responsive site navigation */
.nested {
margin-left: 5%;
}

.no-flex-wrap {
flex-wrap: nowrap;
}

/* Responsive page navigation */

/* Hides page navigation on screen widths smaller than 1300px */
@media screen and (max-width: 1299.98px) {
Expand All @@ -44,19 +49,11 @@
padding: 0;
width: 0px;
}

#page-nav-content-wrapper {
margin-right: 0;
}
}

/* Hide page navigation when printing */
@media print {

#page-nav-content-wrapper {
margin-right: 0;
}

#page-nav {
border: none;
display: none;
Expand Down
Loading

0 comments on commit 03263c5

Please sign in to comment.