cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject [1/2] git commit: Fix android <framework> unit tests to not expect end of line.
Date Fri, 06 Jun 2014 14:15:08 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master d8a971735 -> d8a006530


Fix android <framework> unit tests to not expect end of line.


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

Branch: refs/heads/master
Commit: 6539e41ea1d82ce234b18a97a7df85fabba0a15e
Parents: 2a647ed
Author: Martin Bektchiev <martin.bektchiev@telerik.com>
Authored: Fri Jun 6 09:43:42 2014 +0300
Committer: Martin Bektchiev <martin.bektchiev@telerik.com>
Committed: Fri Jun 6 09:48:25 2014 +0300

----------------------------------------------------------------------
 cordova-lib/spec-plugman/platforms/android.spec.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6539e41e/cordova-lib/spec-plugman/platforms/android.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/android.spec.js b/cordova-lib/spec-plugman/platforms/android.spec.js
index 2713a7b..cee301b 100644
--- a/cordova-lib/spec-plugman/platforms/android.spec.js
+++ b/cordova-lib/spec-plugman/platforms/android.spec.js
@@ -142,10 +142,10 @@ describe('android project handler', function() {
                 android.parseProjectFile(temp).write();
 
                 expect(_.any(writeFileSync.argsForCall, function (callArgs) {
-                    return callArgs[0] === mainProjectPropsFile && callArgs[1].indexOf('\nandroid.library.reference.3=LibraryPath\n')
> -1;
+                    return callArgs[0] === mainProjectPropsFile && callArgs[1].indexOf('\nandroid.library.reference.3=LibraryPath')
> -1;
                 })).toBe(true, 'Reference to library not added');
                 expect(_.any(writeFileSync.argsForCall, function (callArgs) {
-                    return callArgs[0] === subProjectPropsFile && callArgs[1].indexOf('\ntarget=android-19\n')
> -1;
+                    return callArgs[0] === subProjectPropsFile && callArgs[1].indexOf('\ntarget=android-19')
> -1;
                 })).toBe(true, 'target SDK version not copied to library');
                 expect(exec).toHaveBeenCalledWith('android update lib-project --path ' +
subDir);
             });
@@ -176,10 +176,10 @@ describe('android project handler', function() {
 
                 var relativePath = android_project.getRelativeLibraryPath(temp, subDir);
                 expect(_.any(writeFileSync.argsForCall, function (callArgs) {
-                    return callArgs[0] === mainProjectPropsFile && callArgs[1].indexOf('\nandroid.library.reference.3='
+ relativePath + '\n') > -1;
+                    return callArgs[0] === mainProjectPropsFile && callArgs[1].indexOf('\nandroid.library.reference.3='
+ relativePath) > -1;
                 })).toBe(true, 'Reference to library not added');
                 expect(_.any(writeFileSync.argsForCall, function (callArgs) {
-                    return callArgs[0] === subProjectPropsFile && callArgs[1].indexOf('\ntarget=android-19\n')
> -1;
+                    return callArgs[0] === subProjectPropsFile && callArgs[1].indexOf('\ntarget=android-19')
> -1;
                 })).toBe(true, 'target SDK version not copied to library');
                 expect(exec).toHaveBeenCalledWith('android update lib-project --path ' +
subDir);
             });
@@ -243,7 +243,7 @@ describe('android project handler', function() {
                 android.parseProjectFile(temp).write();
 
                 expect(_.any(writeFileSync.argsForCall, function (callArgs) {
-                    return callArgs[0] === mainProjectProps && callArgs[1].indexOf('\nandroid.library.reference.2=ExistingLibRef2\n')
> -1;
+                    return callArgs[0] === mainProjectProps && callArgs[1].indexOf('\nandroid.library.reference.2=ExistingLibRef2')
> -1;
                 })).toBe(true, 'Reference to library not removed');
             });
         });


Mime
View raw message