cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkn...@apache.org
Subject ios commit: CB-11259: Improving build output
Date Mon, 16 May 2016 21:58:07 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/master 20fd96207 -> ee8e983ae


CB-11259: Improving build output

This closes #223


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/ee8e983a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/ee8e983a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/ee8e983a

Branch: refs/heads/master
Commit: ee8e983ae4f8d85d7c05952a793667b97611dbac
Parents: 20fd962
Author: Richard Knoll <richard.b.knoll@gmail.com>
Authored: Thu May 12 17:42:08 2016 -0700
Committer: Richard Knoll <richard.b.knoll@gmail.com>
Committed: Mon May 16 14:53:09 2016 -0700

----------------------------------------------------------------------
 bin/lib/create.js                               | 17 +++++++----
 bin/templates/scripts/cordova/lib/build.js      | 10 +++----
 .../cordova/lib/plugman/pluginHandlers.js       | 30 +++++++++++---------
 bin/templates/scripts/cordova/lib/prepare.js    | 20 ++++++-------
 .../scripts/cordova/lib/projectFile.js          |  2 +-
 bin/templates/scripts/cordova/lib/run.js        |  2 +-
 tests/spec/create.spec.js                       |  2 +-
 tests/spec/unit/Plugman/common.spec.js          |  9 +++---
 tests/spec/unit/Plugman/pluginHandler.spec.js   |  8 +++---
 tests/spec/unit/projectFile.spec.js             |  4 +--
 10 files changed, 58 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 3aadba8..7fa3ee7 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -102,11 +102,11 @@ function copyScripts(projectPath) {
 }
 
 /*
- * Copy project template files into cordova project.  
+ * Copy project template files into cordova project.
  *
  * @param {String} project_path         path to cordova project
  * @param {String} project_name         name of cordova project
- * @param {String} project_template_dir path to cordova-ios template directory     
+ * @param {String} project_template_dir path to cordova-ios template directory
  * @parm  {BOOL}   use_cli              true if cli project
  */
 function copyTemplateFiles(project_path, project_name, project_template_dir, package_name)
{
@@ -168,7 +168,7 @@ function AbsProjectPath(relative_path) {
         absolute_path = AbsParentPath(absolute_path);
     }
     else if (!(/.xcodeproj$/.test(absolute_path))) {
-        throw new Error('The following is not a valid path to an Xcode project' + absolute_path);
+        throw new Error('The following is not a valid path to an Xcode project: ' + absolute_path);
     }
     return absolute_path;
 }
@@ -204,9 +204,16 @@ exports.createProject = function(project_path, package_name, project_name,
opts)
 
     //check that parent directory does exist so cp -r will not fail
     if (!fs.existsSync(project_parent)) {
-        return Q.reject(project_parent + ' does not exist. Please specify an existing parent
folder');
+        return Q.reject('Parent directory "' + project_parent + '" of given project path
does not exist');
     }
 
+    events.emit('log', 'Creating Cordova project for the iOS platform:');
+    events.emit('log', '\tPath: ' + path.relative(process.cwd(), project_path));
+    events.emit('log', '\tPackage: ' + package_name);
+    events.emit('log', '\tName: ' + project_name);
+
+    events.emit('verbose', 'Copying iOS template project to ' + project_path);
+
     // create the project directory and copy over files
     shell.mkdir(project_path);
     shell.cp('-rf', path.join(project_template_dir, 'www'), project_path);
@@ -289,7 +296,7 @@ function update_cordova_subproject(argv) {
     shell.sed('-i', copyWwwSh, copyWwwJs, path.join(projectPath, 'project.pbxproj'));
 
     if (!found) {
-        throw new Error('Subproject: ' + subprojectPath + ' entry not found in project file');
+        throw new Error('Entry not found in project file for sub-project: ' + subprojectPath);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/templates/scripts/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/build.js b/bin/templates/scripts/cordova/lib/build.js
index 8a0949a..800239e 100644
--- a/bin/templates/scripts/cordova/lib/build.js
+++ b/bin/templates/scripts/cordova/lib/build.js
@@ -36,11 +36,11 @@ module.exports.run = function (buildOpts) {
     buildOpts = buildOpts || {};
 
     if (buildOpts.debug && buildOpts.release) {
-        return Q.reject('Only one of "debug"/"release" options should be specified');
+        return Q.reject('Cannot specify "debug" and "release" options together.');
     }
 
     if (buildOpts.device && buildOpts.emulator) {
-        return Q.reject('Only one of "device"/"emulator" options should be specified');
+        return Q.reject('Cannot specify "device" and "emulator" options together.');
     }
 
     if(buildOpts.buildConfig) {
@@ -81,9 +81,9 @@ module.exports.run = function (buildOpts) {
     }).then(function () {
         var configuration = buildOpts.release ? 'Release' : 'Debug';
 
-        events.emit('log','Building project  : ' + path.join(projectPath, projectName + '.xcodeproj'));
-        events.emit('log','\tConfiguration : ' + configuration);
-        events.emit('log','\tPlatform      : ' + (buildOpts.device ? 'device' : 'emulator'));
+        events.emit('log','Building project: ' + path.join(projectPath, projectName + '.xcodeproj'));
+        events.emit('log','\tConfiguration: ' + configuration);
+        events.emit('log','\tPlatform: ' + (buildOpts.device ? 'device' : 'emulator'));
 
         var xcodebuildArgs = getXcodeArgs(projectName, projectPath, configuration, buildOpts.device);
         return spawn('xcodebuild', xcodebuildArgs, projectPath);

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js b/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
index 239883b..68ada04 100644
--- a/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
+++ b/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
@@ -50,8 +50,8 @@ var handlers = {
             var src = obj.src,
                 srcFile = path.resolve(plugin.dir, src),
                 destFile = path.resolve(project.resources_dir, path.basename(src));
-            if (!fs.existsSync(srcFile)) throw new CordovaError('cannot find "' + srcFile
+ '" ios <resource-file>');
-            if (fs.existsSync(destFile)) throw new CordovaError('target destination "' +
destFile + '" already exists');
+            if (!fs.existsSync(srcFile)) throw new CordovaError('Cannot find resource file
"' + srcFile + '" for plugin ' + plugin.id + ' in iOS platform');
+            if (fs.existsSync(destFile)) throw new CordovaError('File already exists at detination
"' + destFile + '" for resource file specified by plugin ' + plugin.id + ' in iOS platform');
             project.xcode.addResourceFile(path.join('Resources', path.basename(src)));
             shell.cp('-R', srcFile, project.resources_dir);
         },
@@ -79,8 +79,8 @@ var handlers = {
 
             var srcFile = path.resolve(plugin.dir, src),
                 targetDir = path.resolve(project.plugins_dir, plugin.id, path.basename(src));
-            if (!fs.existsSync(srcFile)) throw new CordovaError('cannot find "' + srcFile
+ '" ios <framework>');
-            if (fs.existsSync(targetDir)) throw new CordovaError('target destination "' +
targetDir + '" already exists');
+            if (!fs.existsSync(srcFile)) throw new CordovaError('Cannot find framework "'
+ srcFile + '" for plugin ' + plugin.id + ' in iOS platform');
+            if (fs.existsSync(targetDir)) throw new CordovaError('Framework "' + targetDir
+ '" for plugin ' + plugin.id + ' already exists in iOS platform');
             shell.mkdir('-p', path.dirname(targetDir));
             shell.cp('-R', srcFile, path.dirname(targetDir)); // frameworks are directories
             // CB-10773 translate back slashes to forward on win32
@@ -118,19 +118,19 @@ var handlers = {
     },
     'lib-file': {
         install:function(obj, plugin, project, options) {
-            events.emit('verbose', 'lib-file.install is not supported for ios');
+            events.emit('verbose', '<lib-file> install is not supported for iOS plugins');
         },
         uninstall:function(obj, plugin, project, options) {
-            events.emit('verbose', 'lib-file.uninstall is not supported for ios');
+            events.emit('verbose', '<lib-file> uninstall is not supported for iOS plugins');
         }
     },
     'asset':{
         install:function(obj, plugin, project, options) {
             if (!obj.src) {
-                throw new CordovaError('<asset> tag without required "src" attribute.
plugin=' + plugin.dir);
+                throw new CordovaError(generateAttributeError('src', 'asset', plugin.id));
             }
             if (!obj.target) {
-                throw new CordovaError('<asset> tag without required "target" attribute');
+                throw new CordovaError(generateAttributeError('target', 'asset', plugin.id));
             }
 
             copyFile(plugin.dir, obj.src, project.www, obj.target);
@@ -140,7 +140,7 @@ var handlers = {
             var target = obj.target;
 
             if (!target) {
-                throw new Error('<asset> tag without required "target" attribute');
+                throw new CordovaError(generateAttributeError('target', 'asset', plugin.id));
             }
 
             removeFile(project.www, target);
@@ -186,7 +186,7 @@ module.exports.getInstaller = function (type) {
         return handlers[type].install;
     }
 
-    events.emit('warn', '<' + type + '> is not supported for ios plugins');
+    events.emit('warn', '<' + type + '> is not supported for iOS plugins');
 };
 
 module.exports.getUninstaller = function(type) {
@@ -194,7 +194,7 @@ module.exports.getUninstaller = function(type) {
         return handlers[type].uninstall;
     }
 
-    events.emit('warn', '<' + type + '> is not supported for ios plugins');
+    events.emit('warn', '<' + type + '> is not supported for iOS plugins');
 };
 
 function installHelper(type, obj, plugin_dir, project_dir, plugin_id, options, project) {
@@ -277,13 +277,13 @@ function copyFile (plugin_dir, src, project_dir, dest, link) {
     var real_path = fs.realpathSync(src);
     var real_plugin_path = fs.realpathSync(plugin_dir);
     if (real_path.indexOf(real_plugin_path) !== 0)
-        throw new CordovaError('"' + src + '" not located within plugin!');
+        throw new CordovaError('File "' + src + '" is located outside the plugin directory
"' + plugin_dir + '"');
 
     dest = path.resolve(project_dir, dest);
 
     // check that dest path is located in project directory
     if (dest.indexOf(project_dir) !== 0)
-        throw new CordovaError('"' + dest + '" not located within project!');
+        throw new CordovaError('Destination "' + dest + '" for source file "' + src + '"
is located outside the project');
 
     shell.mkdir('-p', path.dirname(dest));
 
@@ -337,3 +337,7 @@ function removeFileAndParents (baseDir, destFile, stopper) {
         }
     }
 }
+
+function generateAttributeError(attribute, element, id) {
+    return 'Required attribute "' + attribute + '" not specified in <' + element + '>
element from plugin: ' + id;
+}

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/templates/scripts/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js
index e4d7fc6..5451aea 100644
--- a/bin/templates/scripts/cordova/lib/prepare.js
+++ b/bin/templates/scripts/cordova/lib/prepare.js
@@ -51,7 +51,7 @@ module.exports.prepare = function (cordovaProject) {
         handleSplashScreens(cordovaProject.projectConfig, self.locations.xcodeCordovaProj);
     })
     .then(function () {
-        events.emit('verbose', 'updated project successfully');
+        events.emit('verbose', 'Prepared iOS project successfully');
     });
 };
 
@@ -70,7 +70,7 @@ module.exports.prepare = function (cordovaProject) {
  *   configuration is already dumped to appropriate config.xml file.
  */
 function updateConfigFile(sourceConfig, configMunger, locations) {
-    events.emit('verbose', 'Generating config.xml from defaults for platform "ios"');
+    events.emit('verbose', 'Generating platform-specific config.xml from defaults for iOS
at ' + locations.configXml);
 
     // First cleanup current config and merge project's one into own
     // Overwrite platform config.xml with defaults.xml.
@@ -80,6 +80,7 @@ function updateConfigFile(sourceConfig, configMunger, locations) {
     // in project (including project's config)
     configMunger.reapply_global_munge().save_all();
 
+    events.emit('verbose', 'Merging project\'s config.xml into platform-specific iOS config.xml');
     // Merge changes from app's config.xml into platform's one
     var config = new ConfigParser(locations.configXml);
     xmlHelpers.mergeXml(sourceConfig.doc.getroot(),
@@ -109,7 +110,7 @@ function updateWww(cordovaProject, destinations) {
     // If project contains 'merges' for our platform, use them as another overrides
     var merges_path = path.join(cordovaProject.root, 'merges', 'ios');
     if (fs.existsSync(merges_path)) {
-        events.emit('verbose', 'Found "merges" for ios platform. Copying over existing "www"
files.');
+        events.emit('verbose', 'Found "merges/ios" folder. Copying its contents into the
iOS project.');
         var overrides = path.join(merges_path, '*');
         shell.cp('-rf', overrides, destinations.www);
     }
@@ -157,8 +158,7 @@ function updateProject(platformConfig, locations) {
     var info_contents = plist.build(infoPlist);
     info_contents = info_contents.replace(/<string>[\s\r\n]*<\/string>/g,'<string></string>');
     fs.writeFileSync(plistFile, info_contents, 'utf-8');
-    events.emit('verbose', 'Wrote out iOS Bundle Identifier to "' + pkg + '"');
-    events.emit('verbose', 'Wrote out iOS Bundle Version to "' + version + '"');
+    events.emit('verbose', 'Wrote out iOS Bundle Identifier "' + pkg + '" and iOS Bundle
Version "' + version + '" to ' + plistFile);
 
     return handleBuildSettings(platformConfig, locations).then(function() {
         if (name == originalName) {
@@ -171,7 +171,7 @@ function updateProject(platformConfig, locations) {
         try {
             proj.parseSync();
         } catch (err) {
-            return Q.reject(new CordovaError('An error occured during parsing of project.pbxproj.
Start weeping. Output: ' + err));
+            return Q.reject(new CordovaError('Could not parse project.pbxproj: ' + err));
         }
 
         proj.updateProductName(name);
@@ -244,7 +244,7 @@ function handleBuildSettings(platformConfig, locations) {
     try {
         proj.parseSync();
     } catch (err) {
-        return Q.reject(new CordovaError('An error occured during parsing of project.pbxproj.
Start weeping. Output: ' + err));
+        return Q.reject(new CordovaError('Could not parse project.pbxproj: ' + err));
     }
 
     if (targetDevice) {
@@ -372,8 +372,8 @@ function getOrientationValue(platformConfig) {
         return orientation;
     }
 
-    events.emit('warn', 'Unsupported orientation: ' + orientation +
-        '. Defaulting to value: ' + ORIENTATION_DEFAULT);
+    events.emit('warn', 'Unrecognized value for Orientation preference: ' + orientation +
+        '. Defaulting to value: ' + ORIENTATION_DEFAULT + '.');
 
     return ORIENTATION_DEFAULT;
 }
@@ -544,6 +544,6 @@ function parseTargetDevicePreference(value) {
     if (map[value.toLowerCase()]) {
         return map[value.toLowerCase()];
     }
-    events.emit('warn', 'Unknown target-device preference value: "' + value + '".');
+    events.emit('warn', 'Unrecognized value for target-device preference: ' + value + '.');
     return null;
 }

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/templates/scripts/cordova/lib/projectFile.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/projectFile.js b/bin/templates/scripts/cordova/lib/projectFile.js
index faa4fd3..aab3863 100644
--- a/bin/templates/scripts/cordova/lib/projectFile.js
+++ b/bin/templates/scripts/cordova/lib/projectFile.js
@@ -48,7 +48,7 @@ function parseProjectFile(locations) {
     var config_file = path.join(path.dirname(plist_file), 'config.xml');
 
     if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) {
-        throw new CordovaError('could not find -Info.plist file, or config.xml file.');
+        throw new CordovaError('Could not find *-Info.plist file, or config.xml file.');
     }
 
     var frameworks_file = path.join(project_dir, 'frameworks.json');

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/bin/templates/scripts/cordova/lib/run.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/run.js b/bin/templates/scripts/cordova/lib/run.js
index 6a7d602..35c93d0 100644
--- a/bin/templates/scripts/cordova/lib/run.js
+++ b/bin/templates/scripts/cordova/lib/run.js
@@ -185,7 +185,7 @@ function listDevices() {
 function listEmulators() {
     return require('./list-emulator-images').run()
     .then(function (emulators) {
-        events.emit('log','Available iOS Virtual Devices:');
+        events.emit('log','Available iOS Simulators:');
         emulators.forEach(function (emulator) {
             events.emit('log','\t' + emulator);
         });

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/tests/spec/create.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/create.spec.js b/tests/spec/create.spec.js
index 7b652de..f5b399a 100644
--- a/tests/spec/create.spec.js
+++ b/tests/spec/create.spec.js
@@ -113,7 +113,7 @@ describe('end-to-end list validation', function(){
         shell.mkdir('-p', path.join(cordova_bin, 'templates', 'scripts', 'HelloCordova.xcodeproj'));
         var command = '"' + path.join(cordova_bin, 'templates', 'scripts', 'cordova', 'run')
+ '" --list';
         var output = shell.exec(command, {silent: true}).output;
-        expect(output).toMatch(/Available iOS Virtual Devices/);
+        expect(output).toMatch(/Available iOS Simulators/);
         expect(output).toMatch(/Available iOS Devices/);
         shell.rm('-f', path.join(cordova_bin, 'templates', 'scripts', 'cordova', 'check_reqs'));
         shell.rm('-f', path.join(cordova_bin, 'templates', 'scripts', 'cordova', 'lib', 'check_reqs.js'));

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/tests/spec/unit/Plugman/common.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/unit/Plugman/common.spec.js b/tests/spec/unit/Plugman/common.spec.js
index 89451e5..58eb27b 100644
--- a/tests/spec/unit/Plugman/common.spec.js
+++ b/tests/spec/unit/Plugman/common.spec.js
@@ -49,8 +49,9 @@ describe('common handler routines', function() {
         it('should throw if src not in plugin directory', function(){
             shell.mkdir('-p', project_dir);
             fs.writeFileSync(non_plugin_file, 'contents', 'utf-8');
-            expect(function(){copyFile(test_dir, '../non_plugin_file', project_dir, dest);}).
-                toThrow(new Error('"' + non_plugin_file + '" not located within plugin!'));
+            var outside_file = '../non_plugin_file';
+            expect(function(){copyFile(test_dir, outside_file, project_dir, dest);}).
+                toThrow(new Error('File "' + path.resolve(test_dir, outside_file) + '" is
located outside the plugin directory "' + test_dir + '"'));
             shell.rm('-rf', test_dir);
         });
 
@@ -77,7 +78,7 @@ describe('common handler routines', function() {
             }
 
             expect(function(){copyFile(test_dir, symlink_file, project_dir, dest);}).
-                toThrow(new Error('"' + symlink_file + '" not located within plugin!'));
+                toThrow(new Error('File "' + path.resolve(test_dir, symlink_file) + '" is
located outside the plugin directory "' + test_dir + '"'));
             shell.rm('-rf', project_dir);
         });
 
@@ -85,7 +86,7 @@ describe('common handler routines', function() {
             shell.mkdir('-p', srcDirTree);
             fs.writeFileSync(srcFile, 'contents', 'utf-8');
             expect(function(){copyFile(test_dir, srcFile, project_dir, non_plugin_file);}).
-                toThrow(new Error('"' + non_plugin_file + '" not located within project!'));
+                toThrow(new Error('Destination "' + path.resolve(project_dir, non_plugin_file)
+ '" for source file "' + path.resolve(test_dir, srcFile) + '" is located outside the project'));
             shell.rm('-rf', project_dir);
         });
 

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/tests/spec/unit/Plugman/pluginHandler.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/unit/Plugman/pluginHandler.spec.js b/tests/spec/unit/Plugman/pluginHandler.spec.js
index 3ac7393..4ced537 100644
--- a/tests/spec/unit/Plugman/pluginHandler.spec.js
+++ b/tests/spec/unit/Plugman/pluginHandler.spec.js
@@ -194,7 +194,7 @@ describe('ios plugin handler', function() {
                 var resources = copyArray(invalid_resources);
                 expect(function() {
                     install(resources[0], faultyPluginInfo, dummyProject);
-                }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/IDontExist.bundle')
+ '" ios <resource-file>');
+                }).toThrow('Cannot find resource file "' + path.resolve(faultyplugin, 'src/ios/IDontExist.bundle')
+ '" for plugin ' + faultyPluginInfo.id + ' in iOS platform');
             });
             it('should throw if resource-file target already exists', function() {
                 var resources = copyArray(valid_resources);
@@ -203,7 +203,7 @@ describe('ios plugin handler', function() {
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
                     install(resources[0], dummyPluginInfo, dummyProject);
-                }).toThrow('target destination "' + target + '" already exists');
+                }).toThrow('File already exists at detination "' + target + '" for resource
file specified by plugin ' + dummyPluginInfo.id + ' in iOS platform');
             });
             it('should call into xcodeproj\'s addResourceFile', function() {
                 var resources = copyArray(valid_resources);
@@ -242,7 +242,7 @@ describe('ios plugin handler', function() {
                     var frameworks = copyArray(invalid_custom_frameworks);
                     expect(function() {
                         install(frameworks[0], faultyPluginInfo, dummyProject);
-                    }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/NonExistantCustomFramework.framework')
+ '" ios <framework>');
+                    }).toThrow('Cannot find framework "' + path.resolve(faultyplugin, 'src/ios/NonExistantCustomFramework.framework')
 + '" for plugin ' + faultyPluginInfo.id + ' in iOS platform');
                 });
                 it('should throw if framework target already exists', function() {
                     var frameworks = copyArray(valid_custom_frameworks);
@@ -250,7 +250,7 @@ describe('ios plugin handler', function() {
                     shell.mkdir('-p', target);
                     expect(function() {
                         install(frameworks[0], dummyPluginInfo, dummyProject);
-                    }).toThrow('target destination "' + target + '" already exists');
+                    }).toThrow('Framework "' + target + '" for plugin ' + dummyPluginInfo.id
+ ' already exists in iOS platform');
                 });
                 it('should cp the file to the right target location', function() {
                     var frameworks = copyArray(valid_custom_frameworks);

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/ee8e983a/tests/spec/unit/projectFile.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/unit/projectFile.spec.js b/tests/spec/unit/projectFile.spec.js
index aca8fd9..e4531df 100644
--- a/tests/spec/unit/projectFile.spec.js
+++ b/tests/spec/unit/projectFile.spec.js
@@ -47,12 +47,12 @@ describe('projectFile', function() {
         it('should throw if project does not contain an appropriate config.xml file', function()
{
             shell.rm(path.join(iosProject, 'SampleApp', 'config.xml'));
             expect(function() { projectFile.parse(locations); })
-                .toThrow('could not find -Info.plist file, or config.xml file.');
+                .toThrow('Could not find *-Info.plist file, or config.xml file.');
         });
         it('should throw if project does not contain an appropriate -Info.plist file', function()
{
             shell.rm(path.join(iosProject, 'SampleApp', 'SampleApp-Info.plist'));
             expect(function () { projectFile.parse(locations); })
-                .toThrow('could not find -Info.plist file, or config.xml file.');
+                .toThrow('Could not find *-Info.plist file, or config.xml file.');
         });
         it('should return right directory when multiple .plist files are present', function()
{
             //Create a folder named A with config.xml and .plist files in it


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message