reporter graph finished

Author: ravelinx22

lib/kraken-mobile/helpers/reporter.rb

@@ -120,22 +120,70 @@ def feature_by_nodes_and_links features_report
     def nodes_and_links feature_report, feature_name
       last_node_id = 0
       nodes = [{ name: "", id: "empty", image: nil }]
+      signal_hash = {}
       links = []
       feature_report.keys.each do |key|
         steps = feature_report[key]
+        coming_from_signal = false
+        last_signal = -1
         steps.each_with_index do |step, index|
           node_id = last_node_id+1
-          node = { name: step[:name], id: "#{node_id}", image: step[:image], status: step[:status] }
-          link = {
-            source: (index == 0 ? 0 : last_node_id),
-            target: node_id,
-            value: 1,
-            owner: key,
-            owner_model: step[:device_model]
-          }
-          nodes << node
-          links << link
-          last_node_id += 1
+          if isReadSignal(step[:name]) && step[:status] == PASSED
+            signal = signalContent(step[:name])
+            already_created_signal = signal_hash[signal] ? true : false
+            signal_hash[signal] = already_created_signal ? signal_hash[signal] : { id: "#{node_id}", receiver: key }
+            node = { name: "Signal: #{signal}, Receiver: #{step[:device_model]}", id: signal_hash[signal][:id], image: nil, status: step[:status] }
+            if already_created_signal
+              entry = nodes.select{ |node| node[:id] == signal_hash[signal][:id] }.first
+              entry[:name] = "Signal: #{signal}, Receiver: #{step[:device_model]}" if entry
+            end
+            source = (coming_from_signal ? last_signal : (index == 0 ? 0 : last_node_id))
+            link = {
+              source: source,
+              target: signal_hash[signal][:id].to_i,
+              value: 1,
+              owner: key,
+              owner_model: step[:device_model]
+            }
+            nodes << node if !already_created_signal
+            links << link
+            last_node_id += 1 if !already_created_signal
+            last_signal = signal_hash[signal][:id].to_i
+            coming_from_signal = true
+          elsif isWriteSignal(step[:name]) && step[:status] == PASSED
+            signal = signalContent(step[:name])
+            receiver = signalReceiver(step[:name])
+            already_created_signal = signal_hash[signal] ? true : false
+            signal_hash[signal] = already_created_signal ? signal_hash[signal] : { id: "#{node_id}", receiver: receiver }
+            node = { name: step[:name], id: signal_hash[signal][:id], image: nil, status: step[:status] }
+            source = (coming_from_signal ? last_signal : (index == 0 ? 0 : last_node_id))
+            link = {
+              source: source,
+              target: signal_hash[signal][:id].to_i,
+              value: 1,
+              owner: key,
+              owner_model: step[:device_model]
+            }
+            nodes << node if !already_created_signal
+            links << link
+            last_node_id += 1 if !already_created_signal
+            last_signal = signal_hash[signal][:id].to_i
+            coming_from_signal = true
+          else
+            node = { name: step[:name], id: "#{node_id}", image: step[:image], status: step[:status] }
+            source = (coming_from_signal ? last_signal : (index == 0 ? 0 : last_node_id))
+            link = {
+              source: source,
+              target: node_id,
+              value: 1,
+              owner: key,
+              owner_model: step[:device_model]
+            }
+            nodes << node
+            links << link
+            last_node_id += 1
+            coming_from_signal = false
+          end
         end
       end
       return {
@@ -145,6 +193,26 @@ def nodes_and_links feature_report, feature_name
       }
     end
 
+    def isReadSignal step
+      line = step.split(' ')[1..-1].join(' ')
+      (line =~ /^I wait for a signal containing "([^\"]*)"$/ ? true : false) || (line =~ /^I wait for a signal containing "([^\"]*)" for (\d+) seconds$/ ? true : false)
+    end
+
+    def isWriteSignal step
+      line = step.split(' ')[1..-1].join(' ')
+      line =~ /^I send a signal to user (\d+) containing "([^\"]*)"$/ ? true : false
+    end
+
+    def signalContent step
+      line = step.split(' ')[1..-1].join(' ')
+      line.scan(/"([^\"]*)"/).first.first if line.scan(/"([^\"]*)"/).first
+    end
+
+    def signalReceiver step
+      line = step.split(' ')[1..-1].join(' ')
+      line.scan(/(\d+)/).first.first if line.scan(/(\d+)/).first
+    end
+
     def generate_features_report features, device
       features.each do |feature|
         generate_feature_report feature, device

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

@@ -99,7 +99,7 @@ def build_execution_command process_number, general_apk, test_files
         raise "Theres not a device for process #{process_number}" unless device
         apk_path = device.config["apk_path"] ? device.config["apk_path"] : general_apk
         raise "Invalid apk path" unless apk_path
-        cucumber_options = "--format json -o #{KrakenMobile::Constants::REPORT_PATH}/#{@execution_id}/#{device.id}/#{KrakenMobile::Constants::REPORT_FILE_NAME}.json"
+        cucumber_options = "--format pretty --format json -o #{KrakenMobile::Constants::REPORT_PATH}/#{@execution_id}/#{device.id}/#{KrakenMobile::Constants::REPORT_FILE_NAME}.json"
 				execution_command = @command_helper.build_command [BASE_COMMAND, apk_path, cucumber_options, *test_files, "--tags @user#{device.position}"]
 				env_variables = {
 					AUTOTEST: '1',

reporter/index.html.erb

@@ -638,14 +638,12 @@
       let devicesHash = {};
       for(var k = 0; k < jsonObject.links.length; k++) {
         let link = jsonObject.links[k];
-        devicesSet.add(link.owner_model);
-        devicesHash[link.owner_model] = link.owner
+        devicesSet.add(link.owner);
+        devicesHash[link.owner] = link.owner_model
       }
       devices = Array.from(devicesSet);
-      var numDevices = jsonObject["numDevices"];
-
       // GRAPH
-      var height = 150*numDevices;
+      var height = 150*(devices.length-1);
       var c20c = d3.scale.category10();
       d3.select("#chart_row" + (i+1))
       .text(jsonObject["name"])
@@ -683,7 +681,7 @@
       var legend = svg
       .append("g")
       .selectAll("g")
-      .data(devices)
+      .data(Object.keys(devicesHash))
       .enter()
       .append('g')
       .attr('class', 'legend')
@@ -698,14 +696,14 @@
       .attr('width', legendRectSize)
       .attr('height', legendRectSize)
       .style('fill', function(d) {
-        return c20c(devicesHash[d]);
+        return c20c(d);
       })
       .style('opacity', .2)
 
       legend.append('text')
       .attr('x', legendRectSize + 5)
       .attr('y', 10)
-      .text(function(d) { return d; });
+      .text(function(d) { return devicesHash[d]; });
     }
   });
   </script>