fix: add lang to pathname

Author: Théotime Huart

packages/didiff-lib/src/__tests__/index.js

@@ -114,33 +114,35 @@ describe('didiff-lib', () => {
     describe('getPathnameFromUrl', () => {
       it('should get slug from basic url', () => {
         expect(getPathnameFromUrl('https://scaleway.com/en/saas')).toMatch(
-          'saas',
+          'en-saas',
         )
       })
       it('should get slug from complex url', () => {
         expect(
           getPathnameFromUrl('https://scaleway.com/fr/dedibox/start'),
-        ).toMatch('dedibox!start')
+        ).toMatch('fr-dedibox-start')
       })
       it('should get slug from home url', () => {
-        expect(getPathnameFromUrl('https://scaleway.com/en/')).toMatch('home')
+        expect(getPathnameFromUrl('https://scaleway.com/en/')).toMatch(
+          'en-index',
+        )
       })
     })
     describe('getImageInformations', () => {
       it('should get informations about image', () => {
         const infos = getImageInformations({
           url: 'https://scaleway.com/en/saas',
-          pathname: 'saas',
+          pathname: 'en-saas',
           name: 'original',
         })
         const fsPath = nodePath.resolve(__dirname, '../screenshots')
 
         expect(infos).toMatchObject({
           url: 'https://scaleway.com/en/saas',
           name: 'original',
-          fullName: 'saas-original.png',
-          fullPath: `${fsPath}/saas-original.png`,
-          path: `${fsPath}/saas`,
+          fullName: 'en-saas-original.png',
+          fullPath: `${fsPath}/en-saas-original.png`,
+          path: `${fsPath}/en-saas`,
         })
       })
     })

packages/didiff-lib/src/capture/index.js

@@ -83,8 +83,6 @@ async function capturePages({ original, sample }) {
     log.err('Fail during the screenshoting process ❌', error)
     process.exit(1)
   }
-
-  log.info('Capturing ✅')
 }
 
 export default capturePages

packages/didiff-lib/src/diff.js

@@ -20,7 +20,6 @@ async function cropBiggerImage({ image, path }, dimensions) {
     width: dimensions.width,
     height: dimensions.height,
   })
-  log.info('Cropping ✅')
 }
 function getSmallestDimensions({ originalData, sampleData }) {
   if (sampleData.png.height > originalData.png.height) {
@@ -84,7 +83,7 @@ async function isCapturesDifferents({ original = {}, sample = {}, diff = {} }) {
       log.info('Diff was found ❗️')
       return true
     }
-    log.info('No diff ✅')
+    log.info('No diff, skipping')
     return false
   } catch (error) {
     log.err('Fail during the diffing process ❌', error)

packages/didiff-lib/src/helpers.js

@@ -37,8 +37,11 @@ function getImageInformations({ url = '', pathname = '', name = '' }) {
 }
 function getPathnameFromUrl(url = '') {
   const urlParts = url.split('/').filter(Boolean)
-  const langIndex = urlParts.findIndex(v => v === 'en' || v === 'fr') + 1
-  return urlParts.slice(langIndex, urlParts.length).join('!') || 'home'
+  const langIndex = urlParts.findIndex(v => v === 'en' || v === 'fr')
+  const slicedName = urlParts.slice(langIndex, urlParts.length) || []
+  return (slicedName.length > 1 ? slicedName : [...slicedName, 'index']).join(
+    '-',
+  )
 }
 
 export {

packages/didiff-lib/src/run.js

@@ -18,9 +18,7 @@ dotenv.config()
 const TEST_DATE = new Date()
 
 function cleanCaptures(fsPaths = []) {
-  log.info('Cleaning screenshots ...')
   removeFiles(fsPaths)
-  log.info('Cleaning screenshots ✅')
 }
 function upload(pathname, { original, sample, diff }) {
   const dateString = TEST_DATE.toLocaleDateString('fr').replace(/\//g, '-')
@@ -65,7 +63,7 @@ async function startLoop(urls) {
   const nbUrls = urls.length
   let totalDiff = 0
 
-  log.info(`Didiff will now check ${nbUrls} urls 📸`)
+  log.info(`Didiff will now check ${nbUrls} urls 📸 \n`)
   for (let i = 0; i < nbUrls; i += 1) {
     const [original, sample] = urls[i]
     const pathname = getPathnameFromUrl(original)
@@ -106,11 +104,12 @@ async function startLoop(urls) {
 
     log.info(`Process for /${pathname} done.`)
     if (nbUrls - (i + 1) === 0) {
-      log.info(`All urls have been handled! (${nbUrls}) 📸`)
+      log.info(`\nAll urls have been handled! (${nbUrls}) 📸`)
       log.info(`Didiff found ${totalDiff} diffs.`)
       log.info(`Shutting down...`)
     } else {
       log.info(`Still ${nbUrls - (i + 1)} check to do.`)
+      log.info('---')
     }
   }
 }

packages/didiff-lib/src/s3.js

@@ -21,7 +21,6 @@ function init() {
 }
 
 function upload({ key, body }) {
-  log.info('Uploading', key)
   const client = getClient()
   client.upload(
     {
@@ -38,6 +37,7 @@ function upload({ key, body }) {
 }
 
 async function uploadBatch(batch = []) {
+  log.info('Uploading...')
   batch.forEach(data => upload(data))
 }
 

packages/didiff-lib/src/urls.js

@@ -15,7 +15,6 @@ function getUrls(file = '') {
         const [o, s] = curr.split(',')
         return [...acc, [o, s]]
       }, [])
-    log.info('Getting urls done ✅')
     return urls || []
   } catch (error) {
     log.err(