Merge pull request #21 from theetrain/fix/token

theetrain · web-flow · commit 4add85af6cd8 · 2017-06-06T18:54:50.000-04:00
fix(helper): use custom token when user provides one
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -119,6 +119,7 @@ function hasInsertionPoint (file) {
 
   if (token !== '' && String(file.contents).indexOf(token) > -1) {
     insertionPoint = 'token'
+    return true
   } else if (token !== '' && token !== defaults.pageToken) {
     logger('Token not found in ' + file.relative)
   }
diff --git a/test/fixtures/test-token-customtoken-result.html b/test/fixtures/test-token-customtoken-result.html
@@ -0,0 +1,12 @@
+<html>
+  <head>
+    <link rel="prefetch" href="asset/image1.jpg" /><link rel="prefetch" href="asset/image2.jpg" /><link rel="prefetch" href="asset/image3.png" /><link rel="prefetch" href="asset/image4.svg" />
+  </head>
+  <body>
+
+    <img src="asset/image1.jpg" alt="">
+    <img src="asset/image2.jpg" alt="">
+    <img src="asset/image3.png" alt="">
+    <img src="asset/image4.svg" alt="">
+  </body>
+</html>
diff --git a/test/fixtures/test-token-customtoken.html b/test/fixtures/test-token-customtoken.html
@@ -0,0 +1,12 @@
+<html>
+  <head>
+    <!--gulp-resource-hints-->
+  </head>
+  <body>
+
+    <img src="asset/image1.jpg" alt="">
+    <img src="asset/image2.jpg" alt="">
+    <img src="asset/image3.png" alt="">
+    <img src="asset/image4.svg" alt="">
+  </body>
+</html>
diff --git a/test/gulpfile.js b/test/gulpfile.js
@@ -63,6 +63,24 @@ gulp.task('userOptionsTest', function (cb) {
     })
 })
 
+gulp.task('customTokenTest', function (cb) {
+  const testName = 'Custom Token Test'
+
+  return gulp.src('./fixtures/test-token*(.html)!(*-result.html)')
+    .pipe(resourceHints({
+      pageToken: '<!--gulp-resource-hints-->'
+    }))
+    .pipe(gulp.dest('./results'))
+    .pipe(compareFiles())
+    .on('end', () => {
+      tap.pass(testName)
+    })
+    .on('error', () => {
+      gutil.log()
+      tap.fail(testName, 'Error on stream')
+    })
+})
+
 gulp.task('expectedFailures', function (cb) {
   const testName = 'Expected Failures'
 
@@ -86,5 +104,5 @@ gulp.task('clean', function (cb) {
 })
 
 gulp.task('default', ['clean'], function (cb) {
-  sequence('defaultTest', 'userOptionsTest', 'expectedFailures')
+  sequence('defaultTest', 'userOptionsTest', 'customTokenTest', 'expectedFailures')
 })

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ function hasInsertionPoint (file) {`
`119`	`119`
`120`	`120`	`if (token !== '' && String(file.contents).indexOf(token) > -1) {`
`121`	`121`	`insertionPoint = 'token'`
	`122`	`+ return true`
`122`	`123`	`} else if (token !== '' && token !== defaults.pageToken) {`
`123`	`124`	`logger('Token not found in ' + file.relative)`
`124`	`125`	`}`