You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2016/11/03 02:46:56 UTC
android commit: Fixed AndroidStudio tests to actually run,
removed app/src/main/assets/ as a requirement and added
app/src/main/res instead, added placeholder for build/ folder,
Removed dupe gitignore
Repository: cordova-android
Updated Branches:
refs/heads/master cfa0fa724 -> 0fd7e7f04
Fixed AndroidStudio tests to actually run, removed app/src/main/assets/ as a requirement and added app/src/main/res instead, added placeholder for build/ folder, Removed dupe gitignore
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0fd7e7f0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0fd7e7f0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0fd7e7f0
Branch: refs/heads/master
Commit: 0fd7e7f040a487d363c84062eb77768320a2c006
Parents: cfa0fa7
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Nov 2 17:55:32 2016 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Nov 2 19:46:33 2016 -0700
----------------------------------------------------------------------
.gitignore | 1 -
bin/templates/cordova/lib/AndroidStudio.js | 7 ++++++-
.../android_studio_project/app/build/placeholder | 1 +
spec/unit/AndroidStudio.js | 14 --------------
spec/unit/AndroidStudio.spec.js | 17 +++++++++++++++++
5 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0fd7e7f0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2abd107..6810237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Desktop.ini
*.iml
.idea
npm-debug.log
-/framework/build
node_modules/jshint
node_modules/promise-matchers
node_modules/jasmine-node
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0fd7e7f0/bin/templates/cordova/lib/AndroidStudio.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/AndroidStudio.js b/bin/templates/cordova/lib/AndroidStudio.js
index 89c4c85..3b1e3d4 100644
--- a/bin/templates/cordova/lib/AndroidStudio.js
+++ b/bin/templates/cordova/lib/AndroidStudio.js
@@ -8,15 +8,20 @@
var path = require('path');
var fs = require('fs');
+var CordovaError = require('cordova-common').CordovaError;
module.exports.isAndroidStudioProject = function isAndroidStudioProject(root) {
var eclipseFiles = ['AndroidManifest.xml', 'libs', 'res', 'project.properties', 'platform_www'];
- var androidStudioFiles = ['app', 'gradle', 'build', 'app/src/main/assets'];
+ var androidStudioFiles = ['app', 'gradle', 'build', 'app/src/main/res'];
// assume it is an AS project and not an Eclipse project
var isEclipse = false;
var isAS = true;
+ if(!fs.existsSync(root)) {
+ throw new CordovaError('AndroidStudio.js:inAndroidStudioProject root does not exist: ' + root);
+ }
+
// if any of the following exists, then we are not an ASProj
eclipseFiles.forEach(function(file) {
if(fs.existsSync(path.join(root, file))) {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0fd7e7f0/spec/fixtures/android_studio_project/app/build/placeholder
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/app/build/placeholder b/spec/fixtures/android_studio_project/app/build/placeholder
new file mode 100644
index 0000000..8b6d9e2
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/build/placeholder
@@ -0,0 +1 @@
+Tests require that this folder exists.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0fd7e7f0/spec/unit/AndroidStudio.js
----------------------------------------------------------------------
diff --git a/spec/unit/AndroidStudio.js b/spec/unit/AndroidStudio.js
deleted file mode 100644
index 74c11f2..0000000
--- a/spec/unit/AndroidStudio.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var AndroidStudio = require('../../bin/templates/cordova/lib/AndroidStudio');
-
-describe('AndroidStudio module', function () {
- it('should detect Android Studio project', function() {
- var root = './fixtures/android_studio_project';
- spyOn(AndroidStudio, 'isAndroidStudioProject').andReturn(true);
- AndroidStudio.isAndroidStudioProject(root);
- });
- it('should detect non Android Studio project', function() {
- var root = './fixtures/android_project';
- spyOn(AndroidStudio, 'isAndroidStudioProject').andReturn(false);
- AndroidStudio.isAndroidStudioProject(root);
- });
-});
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0fd7e7f0/spec/unit/AndroidStudio.spec.js
----------------------------------------------------------------------
diff --git a/spec/unit/AndroidStudio.spec.js b/spec/unit/AndroidStudio.spec.js
new file mode 100644
index 0000000..95d5f4b
--- /dev/null
+++ b/spec/unit/AndroidStudio.spec.js
@@ -0,0 +1,17 @@
+
+var path = require('path');
+var AndroidStudio = require('../../bin/templates/cordova/lib/AndroidStudio');
+
+
+describe('AndroidStudio module', function () {
+ it('should return true for Android Studio project', function() {
+ var root = path.join(__dirname,'../fixtures/android_studio_project/');
+ var isAndStud = AndroidStudio.isAndroidStudioProject(root);
+ expect(isAndStud).toBe(true);
+ });
+ it('should return false non Android Studio project', function() {
+ var root = path.join(__dirname,'../fixtures/android_project/');
+ var isAndStud = AndroidStudio.isAndroidStudioProject(root);
+ expect(isAndStud).toBe(false);
+ });
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org