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

Jump to bottom

Fix path prefix for design system nav urls depending on environment #1005

Merged
merged 2 commits into from
Nov 22, 2018
Merged

Fix path prefix for design system nav urls depending on environment #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b201b00
Fix path prefix for design system nav urls depending on environment
Nov 21, 2018
41ecda3
Update CHANGELOG
Nov 21, 2018
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: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### New
- Added expanding subnavigation to mobile navigation [#1004](https://github.com/hmrc/assets-frontend/pull/1004)

### Fixed
- Updated the fixture and tests for the design library template [#1005](https://github.com/hmrc/assets-frontend/pull/1005)

## [3.7.0 and 4.7.0] 2018-11-19

### New
Expand Down
12 changes: 6 additions & 6 deletions gulpfile.js/tests/fixtures/pattern-library/design-pattern-library-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@

<div id="sections">
{{#each sections}}
<a href="{{ url }}">{{ title }}</a>
<a href="{{ ../pathPrefix }}{{ url }}">{{ title }}</a>
{{/each}}
</div>

<div id="nav">
{{#each nav}}
<a href="{{ url }}">{{ title }}</a>
<a href="{{ ../pathPrefix }}{{ url }}">{{ title }}</a>
{{/each}}
</div>

<div id="mobileNav">
<ul>
{{#each sections}}
<li><a href="{{ ../pathPrefix }}{{ url }}">{{ title }}</a>
<li><a href="{{ ../pathPrefix }}{{ url }}">{{ title }}</a>
{{#if nav}}
<ul>
{{#each nav}}
<li><a href="{{ ../pathPrefix }}{{ url }}">{{ title }}</a></li>
<li><a href="{{ ../../pathPrefix }}{{ url }}">{{ title }}</a></li>
{{/each}}
</ul>
{{/if}}</li>
{{/if}}</li>
{{/each}}
</ul>
</ul>
</div>

<div id="documentation">{{{ documentation }}}</div>
18 changes: 10 additions & 8 deletions gulpfile.js/tests/renderPagesFromTemplate.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ var templatePath = path.join(__dirname, 'fixtures', 'pattern-library', 'design-p
var templateSource = fs.readFileSync(templatePath).toString()
var compiledTemplate = Handlebars.compile(templateSource)

var pathPrefix = (process.env.NODE_ENV === 'prod') ? '/assets-frontend' : ''

var getFiles = function () {
return [
getFile(path.resolve('index.html'), 'section', 'Homepage'),
Expand All @@ -34,7 +36,7 @@ test('renderPagesFromTemplate - renders a homepage', function (t) {

t.equal(
$('#sections a:first-child').attr('href'),
'/index.html',
pathPrefix + '/index.html',
'that have the expected urls'
)

Expand All @@ -56,7 +58,7 @@ test('renderPagesFromTemplate - renders a homepage', function (t) {

t.equal(
$('#mobileNav > ul > li:first-child > a').attr('href'),
'/index.html',
pathPrefix + '/index.html',
'with the first link to the homepage'
)

Expand All @@ -68,7 +70,7 @@ test('renderPagesFromTemplate - renders a homepage', function (t) {

t.equal(
$('#mobileNav > ul > li:nth-child(2) > a').attr('href'),
'/category-one/index.html',
pathPrefix + '/category-one/index.html',
'with a second section link'
)

Expand All @@ -85,7 +87,7 @@ test('renderPagesFromTemplate - renders a homepage', function (t) {

t.equal(
$('#mobileNav > ul > li:nth-child(2) li:first-child a').attr('href'),
'/category-one/thing/index.html',
pathPrefix + '/category-one/thing/index.html',
'with the correct first url'
)

Expand All @@ -97,7 +99,7 @@ test('renderPagesFromTemplate - renders a homepage', function (t) {

t.equal(
$('#mobileNav > ul > li:nth-child(2) li:nth-child(2) a').attr('href'),
'/category-one/thing-two/index.html',
pathPrefix + '/category-one/thing-two/index.html',
'with the correct second url'
)

Expand All @@ -122,7 +124,7 @@ test('renderPagesFromTemplate - renders a section', function (t) {

t.equal(
$('#sections a:nth-child(2)').attr('href'),
'/category-one/index.html',
pathPrefix + '/category-one/index.html',
'that have the expected urls'
)

Expand All @@ -136,7 +138,7 @@ test('renderPagesFromTemplate - renders a section', function (t) {

t.equal(
$('#nav a:first-child').attr('href'),
'/category-one/thing/index.html',
pathPrefix + '/category-one/thing/index.html',
'that have the expected urls'
)

Expand Down Expand Up @@ -175,7 +177,7 @@ test('renderPagesFromTemplate - renders a page', function (t) {

t.equal(
$('#nav a:first-child').attr('href'),
'/category-one/thing/index.html',
pathPrefix + '/category-one/thing/index.html',
'that have the expected urls'
)
t.equal(
Expand Down