You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2019/07/17 12:56:44 UTC
[cordova-android] branch master updated: Simplify and fix promise
handling in specs (#787)
This is an automated email from the ASF dual-hosted git repository.
raphinesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new ad742ec Simplify and fix promise handling in specs (#787)
ad742ec is described below
commit ad742ec93cabb2b6c6e4542a571347d9c78c82f1
Author: Raphael von der Grün <ra...@gmail.com>
AuthorDate: Wed Jul 17 14:56:36 2019 +0200
Simplify and fix promise handling in specs (#787)
---
spec/unit/Api.spec.js | 17 ++--
spec/unit/check_reqs.spec.js | 81 ++++++-----------
spec/unit/create.spec.js | 212 +++++++++++++++++++++----------------------
3 files changed, 138 insertions(+), 172 deletions(-)
diff --git a/spec/unit/Api.spec.js b/spec/unit/Api.spec.js
index fa24e6a..eb82ea2 100644
--- a/spec/unit/Api.spec.js
+++ b/spec/unit/Api.spec.js
@@ -32,7 +32,7 @@ var FIXTURES = path.join(__dirname, '../e2e/fixtures');
var FAKE_PROJECT_DIR = path.join(os.tmpdir(), 'plugin-test-project');
describe('addPlugin method', function () {
- var api, Api, fail, gradleBuilder;
+ var api, Api, gradleBuilder;
beforeEach(function () {
Api = rewire('../../bin/templates/cordova/Api');
@@ -51,24 +51,21 @@ describe('addPlugin method', function () {
api = new Api('android', FAKE_PROJECT_DIR);
- fail = jasmine.createSpy('fail');
gradleBuilder = jasmine.createSpyObj('gradleBuilder', ['prepBuildFiles']);
spyOn(builders, 'getBuilder').and.returnValue(gradleBuilder);
});
- it('Test#001 : should call gradleBuilder.prepBuildFiles for every plugin with frameworks', function (done) {
- api.addPlugin(new PluginInfo(path.join(FIXTURES, 'cordova-plugin-fake'))).catch(fail).fin(function () {
- expect(fail).not.toHaveBeenCalled();
+ const getPluginFixture = name => new PluginInfo(path.join(FIXTURES, name));
+
+ it('Test#001 : should call gradleBuilder.prepBuildFiles for every plugin with frameworks', () => {
+ return api.addPlugin(getPluginFixture('cordova-plugin-fake')).then(() => {
expect(gradleBuilder.prepBuildFiles).toHaveBeenCalled();
- done();
});
});
- it('Test#002 : shouldn\'t trigger gradleBuilder.prepBuildFiles for plugins without android frameworks', function (done) {
- api.addPlugin(new PluginInfo(path.join(FIXTURES, 'cordova-plugin-fake-ios-frameworks'))).catch(fail).fin(function () {
- expect(fail).not.toHaveBeenCalled();
+ it('Test#002 : shouldn\'t trigger gradleBuilder.prepBuildFiles for plugins without android frameworks', () => {
+ return api.addPlugin(getPluginFixture('cordova-plugin-fake-ios-frameworks')).then(() => {
expect(gradleBuilder.prepBuildFiles).not.toHaveBeenCalled();
- done();
});
});
});
diff --git a/spec/unit/check_reqs.spec.js b/spec/unit/check_reqs.spec.js
index 546af77..bfbf88a 100644
--- a/spec/unit/check_reqs.spec.js
+++ b/spec/unit/check_reqs.spec.js
@@ -45,33 +45,25 @@ describe('check_reqs', function () {
spyOn(shelljs, 'which').and.returnValue(null);
spyOn(fs, 'existsSync').and.returnValue(true);
});
- it('it should set ANDROID_HOME on Windows', function (done) {
+ it('it should set ANDROID_HOME on Windows', () => {
spyOn(check_reqs, 'isWindows').and.returnValue(true);
process.env.LOCALAPPDATA = 'windows-local-app-data';
process.env.ProgramFiles = 'windows-program-files';
return check_reqs.check_android().then(function () {
expect(process.env.ANDROID_HOME).toContain('windows-local-app-data');
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
}).fin(function () {
delete process.env.LOCALAPPDATA;
delete process.env.ProgramFiles;
- done();
});
});
- it('it should set ANDROID_HOME on Darwin', function (done) {
+ it('it should set ANDROID_HOME on Darwin', () => {
spyOn(check_reqs, 'isWindows').and.returnValue(false);
spyOn(check_reqs, 'isDarwin').and.returnValue(true);
process.env.HOME = 'home is where the heart is';
return check_reqs.check_android().then(function () {
expect(process.env.ANDROID_HOME).toContain('home is where the heart is');
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
}).fin(function () {
delete process.env.HOME;
- done();
});
});
});
@@ -81,7 +73,7 @@ describe('check_reqs', function () {
return path;
});
});
- it('should set ANDROID_HOME based on `android` command if command exists in a SDK-like directory structure', function (done) {
+ it('should set ANDROID_HOME based on `android` command if command exists in a SDK-like directory structure', () => {
spyOn(fs, 'existsSync').and.returnValue(true);
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'android') {
@@ -92,13 +84,9 @@ describe('check_reqs', function () {
});
return check_reqs.check_android().then(function () {
expect(process.env.ANDROID_HOME).toEqual('/android/sdk');
- done();
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
});
});
- it('should error out if `android` command exists in a non-SDK-like directory structure', function (done) {
+ it('should error out if `android` command exists in a non-SDK-like directory structure', () => {
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'android') {
return '/just/some/random/path/android';
@@ -106,15 +94,14 @@ describe('check_reqs', function () {
return null;
}
});
- return check_reqs.check_android().then(function () {
- done.fail();
- }).fail(function (err) {
- expect(err).toBeDefined();
+ return check_reqs.check_android().then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('update your PATH to include valid path');
- done();
});
});
- it('should set ANDROID_HOME based on `adb` command if command exists in a SDK-like directory structure', function (done) {
+ it('should set ANDROID_HOME based on `adb` command if command exists in a SDK-like directory structure', () => {
spyOn(fs, 'existsSync').and.returnValue(true);
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'adb') {
@@ -125,13 +112,9 @@ describe('check_reqs', function () {
});
return check_reqs.check_android().then(function () {
expect(process.env.ANDROID_HOME).toEqual('/android/sdk');
- done();
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
});
});
- it('should error out if `adb` command exists in a non-SDK-like directory structure', function (done) {
+ it('should error out if `adb` command exists in a non-SDK-like directory structure', () => {
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'adb') {
return '/just/some/random/path/adb';
@@ -139,15 +122,14 @@ describe('check_reqs', function () {
return null;
}
});
- return check_reqs.check_android().then(function () {
- done.fail();
- }).fail(function (err) {
- expect(err).toBeDefined();
+ return check_reqs.check_android().then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('update your PATH to include valid path');
- done();
});
});
- it('should set ANDROID_HOME based on `avdmanager` command if command exists in a SDK-like directory structure', function (done) {
+ it('should set ANDROID_HOME based on `avdmanager` command if command exists in a SDK-like directory structure', () => {
spyOn(fs, 'existsSync').and.returnValue(true);
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'avdmanager') {
@@ -158,13 +140,9 @@ describe('check_reqs', function () {
});
return check_reqs.check_android().then(function () {
expect(process.env.ANDROID_HOME).toEqual('/android/sdk');
- done();
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
});
});
- it('should error out if `avdmanager` command exists in a non-SDK-like directory structure', function (done) {
+ it('should error out if `avdmanager` command exists in a non-SDK-like directory structure', () => {
spyOn(shelljs, 'which').and.callFake(function (cmd) {
if (cmd === 'avdmanager') {
return '/just/some/random/path/avdmanager';
@@ -172,12 +150,11 @@ describe('check_reqs', function () {
return null;
}
});
- return check_reqs.check_android().then(function () {
- done.fail();
- }).fail(function (err) {
- expect(err).toBeDefined();
+ return check_reqs.check_android().then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('update your PATH to include valid path');
- done();
});
});
});
@@ -191,15 +168,11 @@ describe('check_reqs', function () {
afterEach(function () {
delete process.env.ANDROID_HOME;
});
- it('should add tools/bin,tools,platform-tools to PATH if `avdmanager`,`android`,`adb` is not found', function (done) {
+ it('should add tools/bin,tools,platform-tools to PATH if `avdmanager`,`android`,`adb` is not found', () => {
return check_reqs.check_android().then(function () {
expect(process.env.PATH).toContain('let the children play' + path.sep + 'tools');
expect(process.env.PATH).toContain('let the children play' + path.sep + 'platform-tools');
expect(process.env.PATH).toContain('let the children play' + path.sep + 'tools' + path.sep + 'bin');
- done();
- }).fail(function (err) {
- expect(err).toBeUndefined();
- console.log(err);
});
});
});
@@ -212,7 +185,7 @@ describe('check_reqs', function () {
});
});
describe('check_android_target', function () {
- it('should should return full list of supported targets if there is a match to ideal api level', function (done) {
+ it('should should return full list of supported targets if there is a match to ideal api level', () => {
var deferred = Q.defer();
spyOn(android_sdk, 'list_targets').and.returnValue(deferred.promise);
var fake_targets = ['you are my fire', 'my one desire'];
@@ -221,19 +194,19 @@ describe('check_reqs', function () {
return check_reqs.check_android_target().then(function (targets) {
expect(targets).toBeDefined();
expect(targets).toEqual(fake_targets);
- done();
});
});
- it('should error out if there is no match between ideal api level and installed targets', function (done) {
+ it('should error out if there is no match between ideal api level and installed targets', () => {
var deferred = Q.defer();
spyOn(android_sdk, 'list_targets').and.returnValue(deferred.promise);
var fake_targets = ['you are my fire', 'my one desire'];
deferred.resolve(fake_targets);
spyOn(check_reqs, 'get_target').and.returnValue('and i knowwwwwwwwwwww');
- return check_reqs.check_android_target().catch(function (err) {
- expect(err).toBeDefined();
+ return check_reqs.check_android_target().then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Please install Android target');
- done();
});
});
});
diff --git a/spec/unit/create.spec.js b/spec/unit/create.spec.js
index 3ef1f29..0fc2c87 100644
--- a/spec/unit/create.spec.js
+++ b/spec/unit/create.spec.js
@@ -35,54 +35,42 @@ describe('create', function () {
'ball8.ball8.ball8ball'
];
valid.forEach(function (package_name) {
- it('Test#001 : should accept ' + package_name, function (done) {
- create.validatePackageName(package_name).fail(fail).done(done);
+ it('Test#001 : should accept ' + package_name, () => {
+ return create.validatePackageName(package_name);
});
});
});
describe('failure cases (invalid package names)', function () {
- it('should reject empty package names', function (done) {
- create.validatePackageName('').then(fail).fail(function (err) {
- expect(err).toBeDefined();
+ function expectPackageNameToBeRejected (name) {
+ return create.validatePackageName(name).then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Error validating package name');
- }).done(done);
+ });
+ }
+
+ it('should reject empty package names', () => {
+ return expectPackageNameToBeRejected('');
});
- it('should reject package names containing "class"', function (done) {
- create.validatePackageName('com.class.is.bad').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names containing "class"', () => {
+ return expectPackageNameToBeRejected('com.class.is.bad');
});
- it('should reject package names that do not start with a latin letter', function (done) {
- create.validatePackageName('_un.der.score').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names that do not start with a latin letter', () => {
+ return expectPackageNameToBeRejected('_un.der.score');
});
- it('should reject package names with terms that do not start with a latin letter', function (done) {
- create.validatePackageName('un._der.score').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names with terms that do not start with a latin letter', () => {
+ return expectPackageNameToBeRejected('un._der.score');
});
- it('should reject package names containing non-alphanumeric or underscore characters', function (done) {
- create.validatePackageName('th!$.!$.b@d').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names containing non-alphanumeric or underscore characters', () => {
+ return expectPackageNameToBeRejected('th!$.!$.b@d');
});
- it('should reject package names that do not contain enough dots', function (done) {
- create.validatePackageName('therearenodotshere').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names that do not contain enough dots', () => {
+ return expectPackageNameToBeRejected('therearenodotshere');
});
- it('should reject package names that end with a dot', function (done) {
- create.validatePackageName('this.is.a.complete.sentence.').then(fail).fail(function (err) {
- expect(err).toBeDefined();
- expect(err.message).toContain('Error validating package name');
- }).done(done);
+ it('should reject package names that end with a dot', () => {
+ return expectPackageNameToBeRejected('this.is.a.complete.sentence.');
});
});
});
@@ -95,29 +83,35 @@ describe('create', function () {
'CordovaLib'
];
valid.forEach(function (project_name) {
- it('Test#003 : should accept ' + project_name, function (done) {
- create.validateProjectName(project_name).fail(fail).done(done);
+ it('Test#003 : should accept ' + project_name, () => {
+ return create.validateProjectName(project_name);
});
});
});
describe('failure cases (invalid project names)', function () {
- it('should reject empty project names', function (done) {
- create.validateProjectName('').then(fail).fail(function (err) {
- expect(err).toBeDefined();
+ it('should reject empty project names', () => {
+ return create.validateProjectName('').then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Project name cannot be empty');
- }).done(done);
+ });
});
- it('should reject "CordovaActivity" as a project name', function (done) {
- create.validateProjectName('CordovaActivity').then(fail).fail(function (err) {
- expect(err).toBeDefined();
+ 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');
- }).done(done);
+ });
});
- it('should reject project names that begin with a number', function (done) {
- create.validateProjectName('1337').then(fail).fail(function (err) {
- expect(err).toBeDefined();
+ 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');
- }).done(done);
+ });
});
});
});
@@ -156,62 +150,64 @@ describe('create', function () {
revert_manifest_mock();
});
describe('parameter values and defaults', function () {
- it('should have a default package name of my.cordova.project', function (done) {
+ it('should have a default package name of my.cordova.project', () => {
config_mock.packageName.and.returnValue(undefined);
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.validatePackageName).toHaveBeenCalledWith('my.cordova.project');
- }).fail(fail).done(done);
+ });
});
- it('should use the ConfigParser-provided package name, if exists', function (done) {
+ it('should use the ConfigParser-provided package name, if exists', () => {
config_mock.packageName.and.returnValue('org.apache.cordova');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.validatePackageName).toHaveBeenCalledWith('org.apache.cordova');
- }).fail(fail).done(done);
+ });
});
- it('should have a default project name of CordovaExample', function (done) {
+ it('should have a default project name of CordovaExample', () => {
config_mock.name.and.returnValue(undefined);
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.validateProjectName).toHaveBeenCalledWith('CordovaExample');
- }).fail(fail).done(done);
+ });
});
- it('should use the ConfigParser-provided project name, if exists', function (done) {
+ it('should use the ConfigParser-provided project name, if exists', () => {
config_mock.name.and.returnValue('MySweetAppName');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.validateProjectName).toHaveBeenCalledWith('MySweetAppName');
- }).fail(fail).done(done);
+ });
});
- it('should replace any non-word characters (including unicode and spaces) in the ConfigParser-provided project name with underscores', function (done) {
+ it('should replace any non-word characters (including unicode and spaces) in the ConfigParser-provided project name with underscores', () => {
config_mock.name.and.returnValue('応応応応 hello 用用用用');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.validateProjectName).toHaveBeenCalledWith('_____hello_____');
- }).fail(fail).done(done);
+ });
});
- it('should have a default activity name of MainActivity', function (done) {
+ it('should have a default activity name of MainActivity', () => {
config_mock.android_activityName.and.returnValue(undefined);
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(Manifest_mock.prototype.setName).toHaveBeenCalledWith('MainActivity');
- }).fail(fail).done(done);
+ });
});
- it('should use the activityName provided via options parameter, if exists', function (done) {
+ it('should use the activityName provided via options parameter, if exists', () => {
config_mock.android_activityName.and.returnValue(undefined);
- create.create(project_path, config_mock, { activityName: 'AwesomeActivity' }, events_mock).then(function () {
+ return create.create(project_path, config_mock, { activityName: 'AwesomeActivity' }, events_mock).then(() => {
expect(Manifest_mock.prototype.setName).toHaveBeenCalledWith('AwesomeActivity');
- }).fail(fail).done(done);
+ });
});
- it('should use the ConfigParser-provided activity name, if exists', function (done) {
+ it('should use the ConfigParser-provided activity name, if exists', () => {
config_mock.android_activityName.and.returnValue('AmazingActivity');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(Manifest_mock.prototype.setName).toHaveBeenCalledWith('AmazingActivity');
- }).fail(fail).done(done);
+ });
});
});
describe('failure', function () {
- it('should fail if the target path already exists', function (done) {
+ it('should fail if the target path already exists', () => {
fs.existsSync.and.returnValue(true);
- create.create(project_path, config_mock, {}, events_mock).then(fail).fail(function (err) {
- expect(err).toBeDefined();
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
+ fail('Expected promise to be rejected');
+ }, err => {
+ expect(err).toEqual(jasmine.any(Error));
expect(err.message).toContain('Project already exists!');
- }).done(done);
+ });
});
it('should fail if validateProjectName rejects', () => {
const fakeError = new Error();
@@ -226,66 +222,66 @@ describe('create', function () {
});
});
describe('happy path', function () {
- it('should copy project templates from a specified custom template', function (done) {
- create.create(project_path, config_mock, { customTemplate: '/template/path' }, events_mock).then(function () {
+ it('should copy project templates from a specified custom template', () => {
+ return create.create(project_path, config_mock, { customTemplate: '/template/path' }, events_mock).then(() => {
expect(shell.cp).toHaveBeenCalledWith('-r', path.join('/template/path', 'assets'), app_path);
expect(shell.cp).toHaveBeenCalledWith('-r', path.join('/template/path', 'res'), app_path);
expect(shell.cp).toHaveBeenCalledWith(path.join('/template/path', 'gitignore'), path.join(project_path, '.gitignore'));
- }).fail(fail).done(done);
+ });
});
- it('should copy project templates from the default templates location if no custom template is provided', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should copy project templates from the default templates location if no custom template is provided', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(shell.cp).toHaveBeenCalledWith('-r', path.join(default_templates, 'assets'), app_path);
expect(shell.cp).toHaveBeenCalledWith('-r', path.join(default_templates, 'res'), app_path);
expect(shell.cp).toHaveBeenCalledWith(path.join(default_templates, 'gitignore'), path.join(project_path, '.gitignore'));
- }).fail(fail).done(done);
+ });
});
- it('should copy JS and library assets', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should copy JS and library assets', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.copyJsAndLibrary).toHaveBeenCalled();
- }).fail(fail).done(done);
+ });
});
- it('should create a java src directory based on the provided project package name', function (done) {
+ it('should create a java src directory based on the provided project package name', () => {
config_mock.packageName.and.returnValue('org.apache.cordova');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(shell.mkdir).toHaveBeenCalledWith('-p', path.join(app_path, 'java', 'org', 'apache', 'cordova'));
- }).fail(fail).done(done);
+ });
});
- it('should copy, rename and interpolate the template Activity java class with the project-specific activity name and package name', function (done) {
+ it('should copy, rename and interpolate the template Activity java class with the project-specific activity name and package name', () => {
config_mock.packageName.and.returnValue('org.apache.cordova');
config_mock.android_activityName.and.returnValue('CEEDEEVEE');
var activity_path = path.join(app_path, 'java', 'org', 'apache', 'cordova', 'CEEDEEVEE.java');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(shell.cp).toHaveBeenCalledWith('-f', path.join(default_templates, 'Activity.java'), activity_path);
expect(shell.sed).toHaveBeenCalledWith('-i', /__ACTIVITY__/, 'CEEDEEVEE', activity_path);
expect(shell.sed).toHaveBeenCalledWith('-i', /__ID__/, 'org.apache.cordova', activity_path);
- }).fail(fail).done(done);
+ });
});
- it('should interpolate the project name into strings.xml', function (done) {
+ it('should interpolate the project name into strings.xml', () => {
config_mock.name.and.returnValue('IncredibleApp');
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(shell.sed).toHaveBeenCalledWith('-i', /__NAME__/, 'IncredibleApp', path.join(app_path, 'res', 'values', 'strings.xml'));
- }).fail(fail).done(done);
+ });
});
- it('should copy template scripts into generated project', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should copy template scripts into generated project', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.copyScripts).toHaveBeenCalledWith(project_path);
- }).fail(fail).done(done);
+ });
});
- it('should copy build rules / gradle files into generated project', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should copy build rules / gradle files into generated project', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.copyBuildRules).toHaveBeenCalledWith(project_path);
- }).fail(fail).done(done);
+ });
});
- it('should write project.properties file with project details and target API', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should write project.properties file with project details and target API', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.writeProjectProperties).toHaveBeenCalledWith(project_path, fake_android_target);
- }).fail(fail).done(done);
+ });
});
- it('should prepare build files', function (done) {
- create.create(project_path, config_mock, {}, events_mock).then(function () {
+ it('should prepare build files', () => {
+ return create.create(project_path, config_mock, {}, events_mock).then(() => {
expect(create.prepBuildFiles).toHaveBeenCalledWith(project_path);
- }).fail(fail).done(done);
+ });
});
});
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org