github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Major] Removed unnecessary project name restriction (#859)

Browse Source 
* removed unnecessary restriction that prevented project names from starting with a number. Project names starting with a number is perfectly valid.

* Reworded validateProjectName jsdoc

Co-Authored-By: Raphael von der Grün <raphinesse@gmail.com>

Co-authored-by: Raphael von der Grün <raphinesse@gmail.com>
This commit is contained in:
Norman Breau 2020-01-07 10:10:04 -04:00 committed by GitHub
parent 0e6ad28e56
commit 91d2716122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/lib/create.js
View File

@ -208,7 +208,7 @@ function validatePackageName (package_name) {
} }
/** /**
* Test whether a project name is acceptable for use as an android class. * Test whether given string is acceptable for use as a project name
* Returns a promise, fulfilled if the project name is acceptable; rejected * Returns a promise, fulfilled if the project name is acceptable; rejected
* otherwise. * otherwise.
*/ */
@ -219,16 +219,6 @@ function validateProjectName (project_name) {
return Promise.reject(new CordovaError(msg + 'Project name cannot be empty')); return Promise.reject(new CordovaError(msg + 'Project name cannot be empty'));
} }
// Enforce stupid name error
if (project_name === 'CordovaActivity') {
return Promise.reject(new CordovaError(msg + 'Project name cannot be CordovaActivity'));
}
// Classes in Java don't begin with numbers
if (/^[0-9]/.test(project_name)) {
return Promise.reject(new CordovaError(msg + 'Project name must not begin with a number'));
}
return Promise.resolve(); return Promise.resolve();
} }

21
spec/unit/create.spec.js
View File

@ -79,7 +79,10 @@ describe('create', function () {
'mobilespec', 'mobilespec',
'package_name', 'package_name',
'PackageName', 'PackageName',
'CordovaLib' 'CordovaLib',
'1337',
'3 Little Pigs',
'CordovaActivity'
]; ];
valid.forEach(function (project_name) { valid.forEach(function (project_name) {
it('Test#003 : should accept ' + project_name, () => { it('Test#003 : should accept ' + project_name, () => {
@ -96,22 +99,6 @@ describe('create', function () {
expect(err.message).toContain('Project name cannot be empty'); expect(err.message).toContain('Project name cannot be empty');
}); });
}); });
it('should reject "CordovaActivity" as a project name', () => {
return create.validateProjectName('CordovaActivity').then(() => {
fail('Expected promise to be rejected');
}, err => {
expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Project name cannot be CordovaActivity');
});
});
it('should reject project names that begin with a number', () => {
return create.validateProjectName('1337').then(() => {
fail('Expected promise to be rejected');
}, err => {
expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Project name must not begin with a number');
});
});
}); });
}); });
describe('main method', function () { describe('main method', function () {