Skip to content

Do not try to autofill explicit access #385

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 2 commits into from
Mar 15, 2015
Merged

Do not try to autofill explicit access #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55dee7d
Do not try to autofill explicit access
valeriangalliat Mar 15, 2015
6a0ce30
Bump 2.1.4
valeriangalliat Mar 15, 2015
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: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"url": "https://twitter.com/pascalduez"
}
],
"version": "2.1.3",
"version": "2.1.4",
"license": {
"type": "MIT",
"url": "http://opensource.org/licenses/MIT"
Expand Down
7 changes: 6 additions & 1 deletion src/annotation/annotations/access.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export default function access(env) {
},

autofill(item) {
if (item.access !== 'auto') {
return;
}

if (env.privatePrefix === false) {
return;
}
Expand All @@ -24,10 +28,11 @@ export default function access(env) {
return 'private';
}

return 'public';
},

default() {
return 'public';
return 'auto';
},

multiple: false,
Expand Down
24 changes: 15 additions & 9 deletions test/annotations/access.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,28 @@ describe('#access', function () {
});

it('should autofill based on default', function () {
assert.equal(access.autofill({ context: { name: 'non-private'}, access: 'public'}), undefined);
assert.equal(access.autofill({ context: { name: '_private-name'}, access: 'public'}), 'private');
assert.equal(access.autofill({ context: { name: '-private-name'}, access: 'public'}), 'private');
assert.equal(access.autofill({ context: { name: 'non-private'}, access: 'auto'}), 'public');
assert.equal(access.autofill({ context: { name: '_private-name'}, access: 'auto'}), 'private');
assert.equal(access.autofill({ context: { name: '-private-name'}, access: 'auto'}), 'private');
});

it('should ignore autofill if privatePrefix is false', function () {
var accessEnv = accessCtor({ privatePrefix: false });
assert.equal(accessEnv.autofill({ context: { name: 'non-private'}, access: 'public'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '_private-name'}, access: 'public'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '-private-name'}, access: 'public'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: 'non-private'}, access: 'auto'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '_private-name'}, access: 'auto'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '-private-name'}, access: 'auto'}), undefined);
});

it('should autofill based on privatePrefix', function () {
var accessEnv = accessCtor({ privatePrefix: '^--' });
assert.equal(accessEnv.autofill({ context: { name: '-non-private'}, access: 'public'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '_non-private'}, access: 'public'}), undefined);
assert.equal(accessEnv.autofill({ context: { name: '--private-name'}, access: 'public'}), 'private');
assert.equal(accessEnv.autofill({ context: { name: '-non-private'}, access: 'auto'}), 'public');
assert.equal(accessEnv.autofill({ context: { name: '_non-private'}, access: 'auto'}), 'public');
assert.equal(accessEnv.autofill({ context: { name: '--private-name'}, access: 'auto'}), 'private');
});

it('should respect explicit access', function () {
assert.equal(access.autofill({ context: { name: 'non-private'}, access: 'public'}), undefined);
assert.equal(access.autofill({ context: { name: 'private'}, access: 'private'}), undefined);
assert.equal(access.autofill({ context: { name: '_private-name'}, access: 'auto'}), 'private');
});
});