Merge pull request #86 from aquality-automation/develop

Develop
aquality-automation · Feb 24, 2020 · e830ce8 · e830ce8
2 parents 6cc7558 + 25fbe5d
commit e830ce8
Show file tree

Hide file tree

Showing 255 changed files with 5,922 additions and 11,811 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -20,13 +20,16 @@
       "prefix": "app",
       "styles": [
         "styles.css",
-        "../node_modules/font-awesome/css/font-awesome.css"
+        "../node_modules/font-awesome/css/font-awesome.css",
+        "../node_modules/bootstrap/dist/css/bootstrap.min.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.min.js",
+        "../node_modules/popper.js/dist/umd/popper.min.js",
         "../node_modules/jspdf/dist/jspdf.min.js",
         "../node_modules/jspdf-autotable/dist/jspdf.plugin.autotable.js",
-        "../node_modules/chart.js/dist/Chart.bundle.min.js"
+        "../node_modules/chart.js/dist/Chart.bundle.min.js",
+        "../node_modules/bootstrap/dist/js/bootstrap.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 0.3.6 (2020-02-24)
+
+Features:
+  - Move Administration to main Menu bar to make it more visible -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/58)
+  - Test Run view: Add stability indicator -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/60)
+  - Add 'Show resolution slider' for Test Runs chart -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/43)
+  - Move to Bootstrap 4.4.1 -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/66)
+
+Bugfixes:
+  - Csv export with special symbols -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/36)
+
 ## 0.3.5 (2020-02-15)
 
 Features:
@@ -13,8 +24,6 @@ Features:
 Bugfixes:
   - Cannot remove milestone from TestRun -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/50)
   - Refactored Permissions service
-
-Bugfixes:
   - Test Runs: Filter by Start Time date From doesn't work -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/38)
 
 ## 0.3.4 (2019-12-10)

diff --git a/e2e/api/editor.api.ts b/e2e/api/editor.api.ts
@@ -62,7 +62,7 @@ export class EditorAPI {
     }
 
     public async addTestToSuite(testId: number, suiteId: number) {
-        return sendPost(Endpoints.testToSuite, { testId, suiteId, projectId: this.project.id }, {}, this.token, this.project.id);
+        return sendPost(Endpoints.testToSuite, { testId, suiteId, project_id: this.project.id }, {}, this.token, this.project.id);
     }
 
     public async getSuites(testSuite: TestSuite): Promise<TestSuite[]> {
@@ -82,6 +82,6 @@ export class EditorAPI {
     }
 
     public async removeTestRun(testRunId: number) {
-        return sendDelete(Endpoints.testrun, { id: testRunId, projectId: this.project.id}, null, this.token, this.project.id);
+        return sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id}, null, this.token, this.project.id);
     }
 }
diff --git a/e2e/data/expected/testRunSpecialSymbols.csv b/e2e/data/expected/testRunSpecialSymbols.csv
@@ -0,0 +1,4 @@
+Test Name,Fail Reason,Last Results,Result,Resolution,Assignee,Comment
+"Test Feature with all results: step failed","step was failed !”#$%&’()*+,-./:;<=>?@[\]^_`{|}~","","Failed","Not Assigned",,
+"Test Feature with all results: All passed","","","Passed",,,
+"Test Feature with all results: Step skipped","step was skippedstep was skipped","","Pending","Not Assigned",,
diff --git a/e2e/data/import/cucumber.json b/e2e/data/import/cucumber.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/cucumberSpecialSymbols.json b/e2e/data/import/cucumberSpecialSymbols.json
@@ -0,0 +1,121 @@
+[
+  {
+    "description": "Test Report",
+    "keyword": "Feature",
+    "name": "Test Feature with all results",
+    "line": 2,
+    "id": "Test-Report",
+    "tags": [],
+    "uri": "features/testdeature.feature",
+    "elements": [
+      {
+        "id": "passed",
+        "keyword": "Scenario",
+        "line": 7,
+        "name": "All passed",
+        "tags": [],
+        "type": "scenario",
+        "steps": [
+          {
+            "arguments": [],
+            "keyword": "Given ",
+            "line": 8,
+            "name": "passed step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "passed",
+              "duration": 7033
+            }
+          },
+          {
+            "arguments": [],
+            "keyword": "Then ",
+            "line": 9,
+            "name": "passed step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "passed",
+              "duration": 86
+            }
+          }
+        ]
+      }, {
+        "id": "failed",
+        "keyword": "Scenario",
+        "line": 7,
+        "name": "step failed",
+        "tags": [],
+        "type": "scenario",
+        "steps": [
+          {
+            "arguments": [],
+            "keyword": "Given ",
+            "line": 8,
+            "name": "passed step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "passed",
+              "duration": 7033
+            }
+          },
+          {
+            "arguments": [],
+            "keyword": "Then ",
+            "line": 9,
+            "name": "failed step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "failed",
+              "duration": 86,
+              "error_message": "step was failed !”#$%&’()*+,-./:;<=>?@[\\]^_`{|}~"
+            }
+          }
+        ]
+      }, {
+        "id": "failed",
+        "keyword": "Scenario",
+        "line": 7,
+        "name": "Step skipped",
+        "tags": [],
+        "type": "scenario",
+        "steps": [
+          {
+            "arguments": [],
+            "keyword": "Given ",
+            "line": 8,
+            "name": "passed step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "passed",
+              "duration": 7033
+            }
+          },
+          {
+            "arguments": [],
+            "keyword": "Then ",
+            "line": 9,
+            "name": "skipped step",
+            "match": {
+              "location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
+            },
+            "result": {
+              "status": "skipped",
+              "duration": 86,
+              "error_message": "step was skipped"
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/e2e/data/import/milestoneView/login.json b/e2e/data/import/milestoneView/login.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/milestoneView/testRunManager.json b/e2e/data/import/milestoneView/testRunManager.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/milestoneView/testRunViewer.json b/e2e/data/import/milestoneView/testRunViewer.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/oneTestCucumber.json b/e2e/data/import/oneTestCucumber.json
@@ -46,4 +46,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/regexImportErrorSearch/differentError.json b/e2e/data/import/regexImportErrorSearch/differentError.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/regexImportErrorSearch/firstError.json b/e2e/data/import/regexImportErrorSearch/firstError.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/import/regexImportErrorSearch/sameError.json b/e2e/data/import/regexImportErrorSearch/sameError.json
@@ -118,4 +118,4 @@
       }
     ]
   }
-]
+]
diff --git a/e2e/data/lookupOptions.json b/e2e/data/lookupOptions.json
@@ -1,6 +1,6 @@
 {
     "global": {
-        "none":{
+        "none": {
             "name": "None",
             "index": -1
         },
@@ -9,17 +9,17 @@
             "color": "Primary",
             "index": 0
         },
-        "appIssue":{
+        "appIssue": {
             "name": "Application Issue",
             "color": "Danger",
             "index": 1
         },
-        "environmentIssue":{
+        "environmentIssue": {
             "name": "Environment Issue",
             "color": "Warning",
             "index": 2
         },
-        "testIssue":{
+        "testIssue": {
             "name": "Test Issue",
             "color": "Warning",
             "index": 3
@@ -30,4 +30,4 @@
             "index": 4
         }
     }
-}
+}
diff --git a/e2e/data/projects.json b/e2e/data/projects.json
@@ -10,4 +10,4 @@
             "name": "-"
         }
     }
-}
+}
diff --git a/e2e/data/resolutions.json b/e2e/data/resolutions.json
@@ -8,15 +8,15 @@
             "name": "Not Assigned",
             "color": "Primary"
         },
-        "appIssue":{
+        "appIssue": {
             "name": "Application Issue",
             "color": "Danger"
         },
-        "environmentIssue":{
+        "environmentIssue": {
             "name": "Environment Issue",
             "color": "Warning"
         },
-        "testIssue":{
+        "testIssue": {
             "name": "Test Issue",
             "color": "Warning"
         },
@@ -25,4 +25,4 @@
             "color": "Warning"
         }
     }
-}
+}
diff --git a/e2e/data/results.json b/e2e/data/results.json
@@ -1,31 +1,31 @@
 {
-    "none":{
+    "none": {
         "name": "None",
         "index": -1
     },
-    "notExecuted":{
+    "notExecuted": {
         "name": "Not Executed",
         "color": "Primary",
         "index": 2
     },
-    "failed":{
+    "failed": {
         "name": "Failed",
         "color": "Danger",
         "index": 0
     },
-    "inProgress":{
+    "inProgress": {
         "name": "In Progress",
         "color": "Warning",
         "index": 3
     },
-    "passed":{
+    "passed": {
         "name": "Passed",
         "color": "Success",
         "index": 1
     },
-    "pending":{
+    "pending": {
         "name": "Pending",
         "color": "Info",
         "index": 4
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,4 +118,4 @@ @@
           }
         ]
       }
-    ]
+    ]