metadata devices

Author: ravelinx22

lib/kraken-mobile/helpers/devices_helper/adb_helper.rb

@@ -29,6 +29,10 @@ def device_screen_size device_id
         `adb -s #{device_id} shell wm size`
       end
 
+      def device_sdk_version device_id
+        `adb -s #{device_id} shell getprop ro.build.version.sdk`
+      end
+
       def device_orientation device_id
         `adb -s #{device_id} shell dumpsys input | grep 'SurfaceOrientation' | awk '{ print $2 }'`
       end
@@ -118,6 +122,14 @@ def screen_size device_id
         end
       end
 
+      def sdk_version device_id
+        begin
+          return device_sdk_version device_id
+        rescue
+          return "N/A"
+        end
+      end
+
       def orientation device_id
         begin
           adb_orientation = device_orientation(device_id).strip!

lib/kraken-mobile/helpers/reporter.rb

@@ -223,7 +223,7 @@ def feature_duration feature
     def scenario_duration scenario
       how_long = 0
       scenario["steps"].each do |step|
-        how_long += step["result"]["duration"] if step["result"]
+        how_long += step["result"]["duration"] if step["result"] && step["result"]["duration"]
       end
       how_long
     end

lib/kraken-mobile/runners/calabash/android/android_runner.rb

@@ -31,7 +31,9 @@ def before_all
         Dir.mkdir("#{KrakenMobile::Constants::REPORT_PATH}/#{@execution_id}")
         devices_id_list = []
         @devices_manager.connected_devices.each_with_index do |device, index|
-          devices_id_list << { user: (index+1), id: device.id, model: device.model }
+          height, width = @adb_helper.screen_size device.id
+          sdk_version = @adb_helper.sdk_version device.id
+          devices_id_list << { user: (index+1), id: device.id, model: device.model, screen_height: height, screen_width: width, sdk: sdk_version }
           Dir.mkdir("#{KrakenMobile::Constants::REPORT_PATH}/#{@execution_id}/#{device.id}")
         end
         file = open("#{KrakenMobile::Constants::REPORT_PATH}/#{@execution_id}/#{KrakenMobile::Constants::REPORT_DEVICES_FILE_NAME}.json", 'w')

reporter/index.html.erb

@@ -603,8 +603,8 @@
             </div>
             <div class="row device-title"><%= device['model'] %></div>
             <div class="row device-info">ID - <%= device['id'] %></div>
-            <div class="row device-info">Android Version - 141244</div>
-            <div class="row device-info">Screen Size - 200x200</div>
+            <div class="row device-info">SDK Version - <%= device['sdk'] %></div>
+            <div class="row device-info">Screen Size - <%= "#{device['screen_height']}x#{device['screen_width']}" %></div>
             <div class="row device-info result-btn">
               <a href='<%= "./#{device['id']}/feature_report.html" %>'>See Results</a>
             </div>
@@ -700,6 +700,7 @@
       .style('fill', function(d) {
         return c20c(devicesHash[d]);
       })
+      .style('opacity', .2)
 
       legend.append('text')
       .attr('x', legendRectSize + 5)