Merge branch 'master' into cypress

reylejano · May 14, 2019 · 22d111f · 22d111f
2 parents 25b3f81 + 67de85d
commit 22d111f
Show file tree

Hide file tree

Showing 21 changed files with 4,176 additions and 3,729 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,5 @@ documentation
 
 # cypress output
 cypress/screenshots
+# jest reports
+reports
diff --git a/angular.json b/angular.json
@@ -67,18 +67,6 @@
             "browserTarget": "relnotes:build"
           }
         },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": ["src/styles.css"],
-            "scripts": ["node_modules/marked/lib/marked.js"],
-            "assets": ["src/favicon.ico", "src/assets"]
-          }
-        },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {