add tests for appium#1413, also fix jsonwp misinterpretation

logTypes should return array of types, not array of objects cc @ecomrobotics
clymerrm · Nov 5, 2013 · 199d7e4 · 199d7e4
1 parent 6137e13
commit 199d7e4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/devices/android/android-controller.js b/lib/devices/android/android-controller.js
@@ -700,7 +700,7 @@ androidController.getLog = function(logType, cb) {
 androidController.getLogTypes = function(cb) {
     return cb(null, {
         status: status.codes.Success.code
-        , value: logTypesSupported
+        , value: _.keys(logTypesSupported)
     });
 };
 

diff --git a/lib/devices/ios/ios-controller.js b/lib/devices/ios/ios-controller.js
@@ -1434,7 +1434,7 @@ iOSController.getCurrentActivity= function(cb) {
 iOSController.getLogTypes = function(cb) {
     return cb(null, {
         status: status.codes.Success.code
-        , value: logTypesSupported
+        , value: _.keys(logTypesSupported)
     });
 };
 

diff --git a/test/functional/testapp/basic.js b/test/functional/testapp/basic.js
@@ -218,4 +218,23 @@ describeWd('calc app', function(h) {
       done();
     });
   });
+
+  it('should be able to get syslog log type', function(done) {
+    h.driver.logTypes(function(err, logTypes) {
+      should.not.exist(err);
+      logTypes.should.include('syslog');
+      logTypes.should.not.include('logcat');
+      done();
+    });
+  });
+  it('should be able to get syslog logs', function(done) {
+    h.driver.log('syslog', function(err, logs) {
+      should.not.exist(err);
+      logs.length.should.be.above(0);
+      logs[0].message.should.not.include("\n");
+      logs[0].level.should.equal("ALL");
+      should.exist(logs[0].timestamp);
+      done();
+    });
+  });
 });