Skip to content

fix sorting of integer-based lists #13

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

Merged
merged 1 commit into from
Feb 11, 2019
Merged

fix sorting of integer-based lists #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/diff-lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const METRICS_SORTED_BY_COLOR = [
'values.colors.unique',
'values.colors.duplicates'
]
const METRICS_SORTED_BY_INTEGER = ['values.zindexes.unique']

function getSortingFnByKey(key) {
if (METRICS_SORTED_BY_CSS_UNIT.includes(key)) {
Expand All @@ -19,6 +20,10 @@ function getSortingFnByKey(key) {
return cssColorSort.sortFn
}

if (METRICS_SORTED_BY_INTEGER.includes(key)) {
return (a, b) => a - b
}

return (a, b) => caseInsensitiveCompare(a, b)
}

Expand Down
73 changes: 59 additions & 14 deletions test/diff-lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ test('It calculates the diff for two different stats correctly', t => {
['unchangedValue', 'removedValue'],
['addedValue', 'unchangedValue']
)
const expectedDiff = [
const expected = [
{
value: 'addedValue',
removed: false,
Expand All @@ -52,12 +52,12 @@ test('It calculates the diff for two different stats correctly', t => {

t.true(result.changed)
t.is(3, result.diff.length)
t.deepEqual(result.diff, expectedDiff)
t.deepEqual(result.diff, expected)
})

test('It calculates the diff correctly for two exact same stats', t => {
const result = diff(['item1', 'item2'], ['item1', 'item2'])
const expectedDiff = [
const expected = [
{
value: 'item1',
removed: false,
Expand All @@ -74,12 +74,12 @@ test('It calculates the diff correctly for two exact same stats', t => {

t.false(result.changed)
t.is(2, result.diff.length)
t.deepEqual(result.diff, expectedDiff)
t.deepEqual(result.diff, expected)
})

test('It handles the first listable stat being absent in one of the stats', t => {
const actual = diff(undefined, ['cat', 'dog'])
const expectedDiff = {
const expected = {
changed: true,
diff: [
{
Expand All @@ -97,12 +97,12 @@ test('It handles the first listable stat being absent in one of the stats', t =>
]
}

t.deepEqual(actual, expectedDiff)
t.deepEqual(actual, expected)
})

test('It handles the second listable stat being absent in one of the stats', t => {
const actual = diff(['cat', 'dog'], undefined)
const expectedDiff = {
const expected = {
changed: true,
diff: [
{
Expand All @@ -120,15 +120,15 @@ test('It handles the second listable stat being absent in one of the stats', t =
]
}

t.deepEqual(actual, expectedDiff)
t.deepEqual(actual, expected)
})

test('It sorts selectors/values/properties correctly', t => {
const actual = diff(
['a:after', 'a:before'],
['a:after', 'aa:before', 'b:before']
)
const expectedDiff = {
const expected = {
changed: true,
diff: [
{
Expand Down Expand Up @@ -158,7 +158,7 @@ test('It sorts selectors/values/properties correctly', t => {
]
}

t.deepEqual(actual, expectedDiff)
t.deepEqual(actual, expected)
})

test('It sorts fontsizes correctly after comparing them', t => {
Expand All @@ -167,7 +167,7 @@ test('It sorts fontsizes correctly after comparing them', t => {
['0', '.5em', '1em', '3rem'],
'values.fontsizes.unique'
)
const expectedDiff = {
const expected = {
changed: true,
diff: [
{
Expand Down Expand Up @@ -209,7 +209,7 @@ test('It sorts fontsizes correctly after comparing them', t => {
]
}

t.deepEqual(actual, expectedDiff)
t.deepEqual(actual, expected)
})

test('It sorts colors correctly after comparing them', t => {
Expand All @@ -218,7 +218,7 @@ test('It sorts colors correctly after comparing them', t => {
['red', 'yellow', 'green', 'blue', 'purple'],
'values.colors.unique'
)
const expectedDiff = {
const expected = {
changed: true,
diff: [
{
Expand Down Expand Up @@ -260,5 +260,50 @@ test('It sorts colors correctly after comparing them', t => {
]
}

t.deepEqual(actual, expectedDiff)
t.deepEqual(actual, expected)
})

test('it sorts zindexes correctly after comparing them', t => {
const actual = diff(
[-100, -1, 0, 1, 999],
[-100, 0, 1, 999],
'values.zindexes.unique'
)
const expected = {
changed: true,
diff: [
{
value: -100,
changed: false,
added: false,
removed: false
},
{
value: -1,
changed: true,
added: false,
removed: true
},
{
value: 0,
changed: false,
added: false,
removed: false
},
{
value: 1,
changed: false,
added: false,
removed: false
},
{
value: 999,
changed: false,
added: false,
removed: false
}
]
}

t.deepEqual(actual, expected)
})