Merge pull request #488 from telekom/fix/cucumber-testmethod-name

Fix scenario name of cucumber tests

Author: martingrossmann

report-ng/app/src/components/threads/threads.ts

@@ -30,12 +30,8 @@ import {NavigationInstruction, RouteConfig, Router} from "aurelia-router";
 import * as echarts from "echarts";
 import {EChartsOption} from "echarts";
 import {data} from "../../services/report-model";
-import {
-    IntlDateFormatValueConverter
-} from "t-systems-aurelia-components/src/value-converters/intl-date-format-value-converter";
-import {
-    DurationFormatValueConverter
-} from "t-systems-aurelia-components/src/value-converters/duration-format-value-converter";
+import {IntlDateFormatValueConverter} from "t-systems-aurelia-components/src/value-converters/intl-date-format-value-converter";
+import {DurationFormatValueConverter} from "t-systems-aurelia-components/src/value-converters/duration-format-value-converter";
 import {ClassName, ClassNameValueConverter} from "../../value-converters/class-name-value-converter";
 import {MdcSelect} from "@aurelia-mdc-web/select";
 import MethodContext = data.MethodContext;
@@ -288,12 +284,16 @@ export class Threads extends AbstractViewModel {
             startTimes.push(methodContext.contextValues.startTime);
         });
 
+
         const chartStartTime = Math.min.apply(Math, startTimes) - this._gapFromBorderToStart;
         const statusConverter = this._statusConverter;
+        const statisticsGenerator = this._statisticsGenerator;
+        console.log("thread", threadCategories);
 
-        threadCategories.forEach(function (methodContexts, threadName) {
-            methodContexts.forEach((context: MethodContext) => {
+        threadCategories.forEach(function (methodContexts: MethodContext[], threadName: string) {
+            methodContexts.forEach(async (context: MethodContext) => {
 
+                const methodDetails = await statisticsGenerator.getMethodDetails(context.contextValues.id);
                 const itemColor = statusConverter.getColorForStatus(context.resultStatus);
                 const duration = context.contextValues.endTime - context.contextValues.startTime;
                 const classId = executionStatistics.classStatistics.find(classStat => {
@@ -302,9 +302,11 @@ export class Threads extends AbstractViewModel {
                         .filter((value, index, self) => self.indexOf(value) === index);
                     return classContextIds.includes(context.classContextId);
                 }).classIdentifier;
+                console.log("details", methodDetails.identifier);
+
 
                 data.push({
-                    name: context.contextValues.name,
+                    name: methodDetails.identifier,
                     value: [
                         threadName,
                         context.contextValues.startTime,

report-ng/app/src/components/timings/session-timings/session-timings.ts

@@ -224,7 +224,7 @@ export class SessionTimings extends AbstractViewModel {
                 formatter: function (params) {
                     if (params.data) {
                         const seriesIndex = (params.seriesIndex - 2); // two series as offset for the legend placeholder
-                        const testNames = this._dots[seriesIndex].information.methodList.map(method => method.methodContext.contextValues.name);
+                        const testNames = this._dots[seriesIndex].information.methodList.map(method => method.identifier);
                         let tooltipString = '<div class="header" style="background-color: ' +
                             params.color + ';"> ' + this._dots[seriesIndex].information.browserName + ', Version: ' +
                             this._dots[seriesIndex].information.browserVersion + '</div> <br>';

report-ng/app/src/components/timings/test-timings/test-timings.ts

@@ -145,7 +145,7 @@ export class TestTimings extends AbstractViewModel {
             this._methodDetails.forEach(method => {
                 const testDurationMethod: ITestDurationMethod = {
                     id: method.methodContext.contextValues.id,
-                    name: method.methodContext.contextValues.name,
+                    name: method.identifier,
                     duration: (method.methodContext.contextValues.endTime - method.methodContext.contextValues.startTime)/1000,
                     methodType: method.methodContext.methodType,
                     status: method.methodContext.resultStatus