Skip to content

Commit

Permalink
Merge pull request #201 from hexojs/update-ava
Browse files Browse the repository at this point in the history 
Update ava
  • Loading branch information
@ertrzyiks
ertrzyiks authored Jan 24, 2023
2 parents 6d82fdb + 7f72213 commit a16790f
Show file tree
Hide file tree
Showing 6 changed files with 410 additions and 961 deletions.
2 changes: 0 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"stream-to-promise": "^3.0.0"
},
"devDependencies": {
"@ava/babel": "^2.0.0",
"ava": "^3.15.0",
"hexo": "^5.4.0",
"hexo-test-utils": "^0.6.0"
Expand All @@ -39,7 +38,6 @@
"files": [
"specs/*_spec.js"
],
"babel": true,
"snapshotDir": "specs/snapshots"
}
}
14 changes: 7 additions & 7 deletions specs/image_version_helper_spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import test from 'ava'
const test = require('ava')

import getSandbox from './support/sandbox'
import {process} from 'hexo-test-utils/core'
import {hasHelper, getHelper} from 'hexo-test-utils/helpers'
const getSandbox = require('./support/sandbox.js')
const { process } = require('hexo-test-utils/core')
const { hasHelper, getHelper } = require('hexo-test-utils/helpers')

const sandbox = getSandbox()

Expand All @@ -15,7 +15,7 @@ test('returns prefixed version of the filename', async t => {

const imageVersion = getHelper(ctx, 'image_version')

t.is(imageVersion('my/file.jpg', {prefix: 'thumb'}), 'my/thumb_file.jpg')
t.is(imageVersion('my/file.jpg', {prefix: 'small'}), 'my/small_file.jpg')
t.is(imageVersion('file.jpg', {prefix: 'big'}), 'big_file.jpg')
t.is(imageVersion('my/file.jpg', { prefix: 'thumb' }), 'my/thumb_file.jpg')
t.is(imageVersion('my/file.jpg', { prefix: 'small' }), 'my/small_file.jpg')
t.is(imageVersion('file.jpg', { prefix: 'big' }), 'big_file.jpg')
})
92 changes: 46 additions & 46 deletions specs/responsive_images_spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import test from 'ava'
import sharp from 'sharp'
const test = require('ava')
const sharp = require('sharp')

import getSandbox from './support/sandbox'
import {process, mockConfig} from 'hexo-test-utils/core'
import {hasRoute, contentFor} from 'hexo-test-utils/routing'
const getSandbox = require('./support/sandbox.js')
const { process, mockConfig } = require('hexo-test-utils/core')
const { hasRoute, contentFor } = require('hexo-test-utils/routing')

const sandbox = getSandbox()

function getImageDimensions(buffer) {
return sharp(buffer).metadata().then(({width, height}) => {
return {width, height}
return sharp(buffer).metadata().then(({ width, height }) => {
return { width, height }
})
}

Expand All @@ -19,9 +19,9 @@ test('renders prefixed asset', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100},
small: {width: 500},
huge: {width: 1000},
thumb: { width: 100 },
small: { width: 500 },
huge: { width: 1000 },
}
})

Expand All @@ -38,13 +38,13 @@ test('renders resized asset', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100}
thumb: { width: 100 }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 100)
t.is(height, 100)
})
Expand All @@ -55,13 +55,13 @@ test('upscales resized asset', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 1000}
thumb: { width: 1000 }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 1000)
t.is(height, 1000)
})
Expand All @@ -72,7 +72,7 @@ test('renders resized asset by pattern', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*_1.png',
sizes: {
thumb: {width: 100}
thumb: { width: 100 }
}
})

Expand All @@ -90,13 +90,13 @@ test('renders resized assets using array of rules', async t => {
{
pattern: '*_1.png',
sizes: {
super_small: {width: 10}
super_small: { width: 10 }
}
},
{
pattern: '*.png',
sizes: {
thumb: {width: 100}
thumb: { width: 100 }
}
}
])
Expand All @@ -123,7 +123,7 @@ test('uses the priority from the configuration when it is higher', async t => {
{
pattern: '*.png',
sizes: {
super_small: {width: 10}
super_small: { width: 10 }
}
}
]
Expand All @@ -150,7 +150,7 @@ test('uses the priority from the configuration when it is lower', async t => {
{
pattern: '*.png',
sizes: {
super_small: {width: 10}
super_small: { width: 10 }
}
}
]
Expand All @@ -174,7 +174,7 @@ test('uses the priority from the configuration when it is default', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
super_small: {width: 10}
super_small: { width: 10 }
}
})

Expand All @@ -192,13 +192,13 @@ test('handles withoutEnlargement', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 1000, withoutEnlargement: true}
thumb: { width: 1000, withoutEnlargement: true }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 600)
t.is(height, 600)
})
Expand All @@ -209,13 +209,13 @@ test('handles deprecated embed', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, embed: true}
thumb: { width: 100, height: 50, embed: true }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'embed'})
t.snapshot(buffer.toString('base64'))
})

test('handles deprecated min', async t => {
Expand All @@ -224,13 +224,13 @@ test('handles deprecated min', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, min: true}
thumb: { width: 100, height: 50, min: true }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 100)
t.is(height, 100)
})
Expand All @@ -241,13 +241,13 @@ test('handles deprecated max', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, max: true}
thumb: { width: 100, height: 50, max: true }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 50)
t.is(height, 50)
})
Expand All @@ -258,26 +258,26 @@ test('handles deprecated ignoreAspectRatio', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, ignoreAspectRatio: true}
thumb: { width: 100, height: 50, ignoreAspectRatio: true }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'ignoreAspectRatio'})
t.snapshot(buffer.toString('base64'))
})

test('handles deprecated crop', async t => {
const ctx = await sandbox('test1')
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 50, height: 100, crop: 'east'}
thumb: { width: 50, height: 100, crop: 'east' }
}
})
await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'crop'})
t.snapshot(buffer.toString('base64'))
})

test('handles embed', async t => {
Expand All @@ -286,13 +286,13 @@ test('handles embed', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, fit: 'contain'}
thumb: { width: 100, height: 50, fit: 'contain' }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'embed'})
t.snapshot(buffer.toString('base64'))
})

test('handles min', async t => {
Expand All @@ -301,13 +301,13 @@ test('handles min', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, fit: 'outside'}
thumb: { width: 100, height: 50, fit: 'outside' }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 100)
t.is(height, 100)
})
Expand All @@ -318,13 +318,13 @@ test('handles max', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, fit: 'inside'}
thumb: { width: 100, height: 50, fit: 'inside' }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const {width, height} = await getImageDimensions(buffer)
const { width, height } = await getImageDimensions(buffer)
t.is(width, 50)
t.is(height, 50)
})
Expand All @@ -335,26 +335,26 @@ test('handles ignoreAspectRatio', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, fit: 'fill'}
thumb: { width: 100, height: 50, fit: 'fill' }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'ignoreAspectRatio'})
t.snapshot(buffer.toString('base64'))
})

test('handles crop', async t => {
const ctx = await sandbox('test1')
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 50, height: 100, fit: 'cover', position: 'east'}
thumb: { width: 50, height: 100, fit: 'cover', position: 'east' }
}
})
await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
t.snapshot(buffer.toString('base64'), {id: 'crop'})
t.snapshot(buffer.toString('base64'))
})

test('handles quality', async t => {
Expand All @@ -363,8 +363,8 @@ test('handles quality', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.jpg',
sizes: {
high_quality: {width: 100, height: 50, quality: 100},
low_quality: {width: 100, height: 50, quality: 10}
high_quality: { width: 100, height: 50, quality: 100 },
low_quality: { width: 100, height: 50, quality: 10 }
}
})

Expand All @@ -383,12 +383,12 @@ test('keeps image type with quality setting', async t => {
mockConfig(ctx, 'responsive_images', {
pattern: '*.png',
sizes: {
thumb: {width: 100, height: 50, quality: 80}
thumb: { width: 100, height: 50, quality: 80 }
}
})

await process(ctx)
const buffer = await contentFor(ctx, 'thumb_image.png')
const result = await sharp(buffer).toBuffer({resolveWithObject: true})
const result = await sharp(buffer).toBuffer({ resolveWithObject: true })
t.is(result.info.format, 'png')
})
Loading

0 comments on commit a16790f

Please sign in to comment.