You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2014/06/06 16:15:08 UTC
[1/2] git commit: Fix android unit tests to not expect
end of line.
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 <ma...@telerik.com>
Authored: Fri Jun 6 09:43:42 2014 +0300
Committer: Martin Bektchiev <ma...@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');
});
});
[2/2] git commit: Merge
'icenium/bektchiev/refer-properties-parser-from-npm'
Posted by ka...@apache.org.
Merge 'icenium/bektchiev/refer-properties-parser-from-npm'
Fix android <framework> unit tests to not expect end of line.
github: close #25
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d8a00653
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d8a00653
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d8a00653
Branch: refs/heads/master
Commit: d8a00653032a09b26f8ff515bb16251a3765390b
Parents: d8a9717 6539e41
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Fri Jun 6 10:13:54 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Fri Jun 6 10:13:54 2014 -0400
----------------------------------------------------------------------
cordova-lib/spec-plugman/platforms/android.spec.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------