tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 permit Facebook usernames with less than 5 chars (#632) 

refs https://github.com/TryGhost/Ghost/issues/8296
- permit Facebook usernames with less than 5 chars
    - brands are allowed to have Page names with less than 5 chars (ex: facebook.com/nike)
    - current/former employees are allowed to have usernames with less than 5 chars (ex: facebook.com/zuck)
This commit is contained in:
Rodney Folz 2017-05-15 11:26:34 -07:00 committed by Kevin Ansfield
parent 6de16a3c55
commit 7457ffb26d
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/settings/general.js
View File

@ -134,8 +134,8 @@ export default Controller.extend({
// we got a page url, now save the username without the / in the beginning
[, username] = username.match(/^(?:\/)?(pages?\/\S+)/mi);
} else if (username.match(/^(http|www)|(\/)/) || !username.match(/^([a-z\d\.]{5,50})$/mi)) {
errMessage = !username.match(/^([a-z\d\.]{5,50})$/mi) ? 'Your Page name is not a valid Facebook Page name' : 'The URL must be in a format like https://www.facebook.com/yourPage';
} else if (username.match(/^(http|www)|(\/)/) || !username.match(/^([a-z\d\.]{1,50})$/mi)) {
errMessage = !username.match(/^([a-z\d\.]{1,50})$/mi) ? 'Your Page name is not a valid Facebook Page name' : 'The URL must be in a format like https://www.facebook.com/yourPage';
this.get('model.errors').add('facebook', errMessage);
this.get('model.hasValidated').pushObject('facebook');

4
app/controllers/team/user.js
View File

@ -282,8 +282,8 @@ export default Controller.extend({
// we got a page url, now save the username without the / in the beginning
[, username] = username.match(/^(?:\/)?(pages?\/\S+)/mi);
} else if (username.match(/^(http|www)|(\/)/) || !username.match(/^([a-z\d\.]{5,50})$/mi)) {
errMessage = !username.match(/^([a-z\d\.]{5,50})$/mi) ? 'Your Username is not a valid Facebook Username' : 'The URL must be in a format like https://www.facebook.com/yourUsername';
} else if (username.match(/^(http|www)|(\/)/) || !username.match(/^([a-z\d\.]{1,50})$/mi)) {
errMessage = !username.match(/^([a-z\d\.]{1,50})$/mi) ? 'Your Username is not a valid Facebook Username' : 'The URL must be in a format like https://www.facebook.com/yourUsername';
this.get('user.errors').add('facebook', errMessage);
this.get('user.hasValidated').pushObject('facebook');

3
tests/acceptance/settings/general-test.js
View File

@ -208,8 +208,9 @@ describe('Acceptance: Settings - General', function () {
await fillIn(testSelector('facebook-input'), 'ab99');
await triggerEvent(testSelector('facebook-input'), 'blur');
expect(find(testSelector('facebook-input')).val()).to.be.equal('https://www.facebook.com/ab99');
expect(find(testSelector('facebook-error')).text().trim(), 'inline validation response')
.to.equal('Your Page name is not a valid Facebook Page name');
.to.equal('');
await fillIn(testSelector('facebook-input'), 'page/ab99');
await triggerEvent(testSelector('facebook-input'), 'blur');

3
tests/acceptance/team-test.js
View File

@ -560,7 +560,8 @@ describe('Acceptance: Team', function () {
await fillIn('#user-facebook', 'test');
await triggerEvent('#user-facebook', 'blur');
expect(find('#user-facebook').closest('.form-group').hasClass('error'), 'facebook input should be in error state').to.be.true;
expect(find('#user-facebook').val()).to.be.equal('https://www.facebook.com/test');
expect(find('#user-facebook').closest('.form-group').hasClass('error'), 'facebook input should be in error state').to.be.false;
await fillIn('#user-facebook', '');
await fillIn('#user-facebook', 'http://twitter.com/testuser');