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

fix(meta-viewport): show attribute in message #1061

Merged
merged 2 commits into from
Aug 16, 2018
Merged

fix(meta-viewport): show attribute in message #1061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
545dfaa
fix(meta-viewport): show attribute in message
Aug 7, 2018
2e9c4e0
Merge branch 'develop' into meta-viewport-msg
WilcoFiers Aug 16, 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
2 changes: 2 additions & 0 deletions lib/checks/mobile/meta-viewport-scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ if (
}

if (!lowerBound && result['user-scalable'] === 'no') {
this.data('user-scalable=no');
return false;
}

if (result['maximum-scale'] && parseFloat(result['maximum-scale']) < minimum) {
this.data('maximum-scale');
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/checks/mobile/meta-viewport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"impact": "critical",
"messages": {
"pass": "<meta> tag does not disable zooming on mobile devices",
"fail": "<meta> tag disables zooming on mobile devices"
"fail": "{{=it.data}} on <meta> tag disables zooming on mobile devices"
}
}
}
40 changes: 27 additions & 13 deletions test/checks/mobile/meta-viewport-scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,28 @@ describe('meta-viewport', function() {
'use strict';

var fixture = document.getElementById('fixture');
var checkContext = axe.testUtils.MockCheckContext();

afterEach(function() {
fixture.innerHTML = '';
checkContext.reset();
});
describe('; separator', function() {
it('should return false on user-scalable=no', function() {
fixture.innerHTML =
'<meta name="viewport" content="foo=bar, cats=dogs, user-scalable=no">';
var node = fixture.querySelector('meta');

assert.isFalse(checks['meta-viewport'].evaluate(node));
assert.isFalse(checks['meta-viewport'].evaluate.call(checkContext, node));
assert.deepEqual(checkContext._data, 'user-scalable=no');
});

it('should return false on user-scalable=no', function() {
fixture.innerHTML =
'<meta name="viewport" content="foo=bar, cats=dogs, user-scalable=no, more-stuff=ok">';
var node = fixture.querySelector('meta');

assert.isFalse(checks['meta-viewport'].evaluate(node));
assert.isFalse(checks['meta-viewport'].evaluate.call(checkContext, node));
});

it('should return true on user-scalable=yes', function() {
Expand All @@ -37,14 +40,16 @@ describe('meta-viewport', function() {
var node = fixture.querySelector('meta');

assert.isTrue(
checks['meta-viewport'].evaluate(node, { scaleMinimum: 2 })
checks['meta-viewport'].evaluate.call(checkContext, node, {
scaleMinimum: 2
})
);

fixture.innerHTML =
'<meta name="viewport" content="foo=bar, maximum-scale=3, cats=dogs">';
node = fixture.querySelector('meta');

assert.isTrue(checks['meta-viewport'].evaluate(node));
assert.isTrue(checks['meta-viewport'].evaluate.call(checkContext, node));
});

it('should return false on maximum-scale < options.scaleMinimum', function() {
Expand All @@ -53,15 +58,18 @@ describe('meta-viewport', function() {
var node = fixture.querySelector('meta');

assert.isFalse(
checks['meta-viewport'].evaluate(node, { scaleMinimum: 2 })
checks['meta-viewport'].evaluate.call(checkContext, node, {
scaleMinimum: 2
})
);
assert.deepEqual(checkContext._data, 'maximum-scale');
});

it('should return true if neither user-scalable or maximum-scale are set', function() {
fixture.innerHTML = '<meta name="viewport" content="foo=bar, cats=dogs">';
var node = fixture.querySelector('meta');

assert.isTrue(checks['meta-viewport'].evaluate(node));
assert.isTrue(checks['meta-viewport'].evaluate.call(checkContext, node));
});
});

Expand All @@ -71,38 +79,42 @@ describe('meta-viewport', function() {
'<meta name="viewport" content="foo=bar, cats=dogs, user-scalable=no">';
var node = fixture.querySelector('meta');

assert.isFalse(checks['meta-viewport'].evaluate(node));
assert.isFalse(checks['meta-viewport'].evaluate.call(checkContext, node));
assert.deepEqual(checkContext._data, 'user-scalable=no');
});

it('should return false on user-scalable=no', function() {
fixture.innerHTML =
'<meta name="viewport" content="foo=bar, cats=dogs, user-scalable=no, more-stuff=ok">';
var node = fixture.querySelector('meta');

assert.isFalse(checks['meta-viewport'].evaluate(node));
assert.isFalse(checks['meta-viewport'].evaluate.call(checkContext, node));
assert.deepEqual(checkContext._data, 'user-scalable=no');
});

it('should return true on user-scalable=yes', function() {
fixture.innerHTML =
'<meta name="viewport" content="foo=bar, cats=dogs, user-scalable=yes, more-stuff=ok">';
var node = fixture.querySelector('meta');

assert.isTrue(checks['meta-viewport'].evaluate(node));
assert.isTrue(checks['meta-viewport'].evaluate.call(checkContext, node));
});

it('should return true if maximum-scale >= options.scaleMinimum', function() {
fixture.innerHTML =
'<meta name="viewport" content="foo=bar, maximum-scale=5, cats=dogs">';
var node = fixture.querySelector('meta');

assert.isTrue(checks['meta-viewport'].evaluate(node));
assert.isTrue(checks['meta-viewport'].evaluate.call(checkContext, node));

fixture.innerHTML =
'<meta name="viewport" content="foo=bar, maximum-scale=2, cats=dogs">';
node = fixture.querySelector('meta');

assert.isTrue(
checks['meta-viewport'].evaluate(node, { scaleMinimum: 2 })
checks['meta-viewport'].evaluate.call(checkContext, node, {
scaleMinimum: 2
})
);
});

Expand All @@ -112,15 +124,17 @@ describe('meta-viewport', function() {
var node = fixture.querySelector('meta');

assert.isFalse(
checks['meta-viewport'].evaluate(node, { scaleMinimum: 2 })
checks['meta-viewport'].evaluate.call(checkContext, node, {
scaleMinimum: 2
})
);
});

it('should return true if neither user-scalable or maximum-scale are set', function() {
fixture.innerHTML = '<meta name="viewport" content="foo=bar, cats=dogs">';
var node = fixture.querySelector('meta');

assert.isTrue(checks['meta-viewport'].evaluate(node));
assert.isTrue(checks['meta-viewport'].evaluate.call(checkContext, node));
});
});
});