fix tests

dfa1234 · Jun 23, 2023 · 754ad9b · 754ad9b
1 parent a748c1e
commit 754ad9b
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 162 deletions.
diff --git a/package.json b/package.json
@@ -12,14 +12,14 @@
     "compression"
   ],
   "scripts": {
-    "start": "nx serve",
+    "start": "nx serve ngx-image-compress-demo",
     "lint:app": "nx lint ngx-image-compress-demo",
     "lint:lib": "nx lint ngx-image-compress",
     "test-prepare": "node scripts/convert-assets-to-data-urls.js",
-    "test:app": "nx test",
+    "test:app": "nx test ngx-image-compress-demo",
     "test:library": "npm run test-prepare && nx test ngx-image-compress",
-    "ci:test:app": "nx test ngx-image-compress-demo --browsers=ChromeHeadless --watch=false --code-coverage",
-    "ci:test:library": "npm run test-prepare && nx test ngx-image-compress --browsers=ChromeHeadless --watch=false --code-coverage",
+    "ci:test:app": "nx test ngx-image-compress-demo",
+    "ci:test:library": "npm run test-prepare && nx test ngx-image-compress",
     "ci:build:app": "nx build ngx-image-compress-demo",
     "ci:build:library": "nx build ngx-image-compress"
   },

diff --git a/projects/ngx-image-compress-demo/project.json b/projects/ngx-image-compress-demo/project.json
@@ -1,119 +1,105 @@
 {
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "name": "ngx-image-compress-demo",
-  "projectType": "application",
-  "generators": {
-    "@schematics/angular:component": {
-      "style": "scss"
-    }
-  },
-  "sourceRoot": "projects/ngx-image-compress-demo/src",
-  "prefix": "app",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
-      "options": {
-        "outputPath": "{workspaceRoot}/dist/ngx-image-compress-demo",
-        "index": "projects/ngx-image-compress-demo/src/index.html",
-        "main": "projects/ngx-image-compress-demo/src/main.ts",
-        "polyfills": [
-          "zone.js"
-        ],
-        "tsConfig": "projects/ngx-image-compress-demo/tsconfig.app.json",
-        "inlineStyleLanguage": "scss",
-        "assets": [
-          "projects/ngx-image-compress-demo/src/assets/favicons/favicon.ico",
-          "projects/ngx-image-compress-demo/src/assets"
-        ],
-        "styles": [
-          "projects/ngx-image-compress-demo/src/styles.scss"
-        ],
-        "scripts": []
-      },
-      "configurations": {
-        "production": {
-          "budgets": [
-            {
-              "type": "initial",
-              "maximumWarning": "500kb",
-              "maximumError": "1mb"
+    "$schema": "../../node_modules/nx/schemas/project-schema.json",
+    "name": "ngx-image-compress-demo",
+    "projectType": "application",
+    "generators": {
+        "@schematics/angular:component": {
+            "style": "scss"
+        }
+    },
+    "sourceRoot": "projects/ngx-image-compress-demo/src",
+    "prefix": "app",
+    "targets": {
+        "build": {
+            "executor": "@angular-devkit/build-angular:browser",
+            "options": {
+                "outputPath": "{workspaceRoot}/dist/ngx-image-compress-demo",
+                "index": "projects/ngx-image-compress-demo/src/index.html",
+                "main": "projects/ngx-image-compress-demo/src/main.ts",
+                "polyfills": ["zone.js"],
+                "tsConfig": "projects/ngx-image-compress-demo/tsconfig.app.json",
+                "inlineStyleLanguage": "scss",
+                "assets": [
+                    "projects/ngx-image-compress-demo/src/assets/favicons/favicon.ico",
+                    "projects/ngx-image-compress-demo/src/assets"
+                ],
+                "styles": ["projects/ngx-image-compress-demo/src/styles.scss"],
+                "scripts": []
             },
-            {
-              "type": "anyComponentStyle",
-              "maximumWarning": "2kb",
-              "maximumError": "4kb"
-            }
-          ],
-          "fileReplacements": [
-            {
-              "replace": "projects/ngx-image-compress-demo/src/environments/environment.ts",
-              "with": "projects/ngx-image-compress-demo/src/environments/environment.prod.ts"
+            "configurations": {
+                "production": {
+                    "budgets": [
+                        {
+                            "type": "initial",
+                            "maximumWarning": "500kb",
+                            "maximumError": "1mb"
+                        },
+                        {
+                            "type": "anyComponentStyle",
+                            "maximumWarning": "2kb",
+                            "maximumError": "4kb"
+                        }
+                    ],
+                    "fileReplacements": [
+                        {
+                            "replace": "projects/ngx-image-compress-demo/src/environments/environment.ts",
+                            "with": "projects/ngx-image-compress-demo/src/environments/environment.prod.ts"
+                        }
+                    ],
+                    "outputHashing": "all"
+                },
+                "development": {
+                    "buildOptimizer": false,
+                    "optimization": false,
+                    "vendorChunk": true,
+                    "extractLicenses": false,
+                    "sourceMap": true,
+                    "namedChunks": true
+                }
+            },
+            "defaultConfiguration": "production",
+            "outputs": ["{options.outputPath}"]
+        },
+        "serve": {
+            "executor": "@angular-devkit/build-angular:dev-server",
+            "configurations": {
+                "production": {
+                    "browserTarget": "ngx-image-compress-demo:build:production"
+                },
+                "development": {
+                    "browserTarget": "ngx-image-compress-demo:build:development"
+                }
+            },
+            "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+            "executor": "@angular-devkit/build-angular:extract-i18n",
+            "options": {
+                "browserTarget": "ngx-image-compress-demo:build"
             }
-          ],
-          "outputHashing": "all"
         },
-        "development": {
-          "buildOptimizer": false,
-          "optimization": false,
-          "vendorChunk": true,
-          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
-        }
-      },
-      "defaultConfiguration": "production",
-      "outputs": [
-        "{options.outputPath}"
-      ]
-    },
-    "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
-      "configurations": {
-        "production": {
-          "browserTarget": "ngx-image-compress-demo:build:production"
+        "test": {
+            "executor": "@angular-devkit/build-angular:karma",
+            "options": {
+                "polyfills": ["zone.js", "zone.js/testing"],
+                "tsConfig": "tsconfig.spec.json",
+                "inlineStyleLanguage": "scss",
+                "assets": [
+                    "projects/ngx-image-compress-demo/src/assets/favicons/favicon.ico",
+                    "projects/ngx-image-compress-demo/src/assets"
+                ],
+                "styles": ["projects/ngx-image-compress-demo/src/styles.scss"],
+                "codeCoverage": true,
+                "browsers": "ChromeHeadless",
+                "progress": true
+            }
         },
-        "development": {
-          "browserTarget": "ngx-image-compress-demo:build:development"
+        "lint": {
+            "executor": "@angular-eslint/builder:lint",
+            "options": {
+                "lintFilePatterns": ["projects/ngx-image-compress-demo/src/**/*.ts", "projects/ngx-image-compress-demo/src/**/*.html"]
+            },
+            "outputs": ["{options.outputFile}"]
         }
-      },
-      "defaultConfiguration": "development"
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "browserTarget": "ngx-image-compress-demo:build"
-      }
-    },
-    "test": {
-      "executor": "@angular-devkit/build-angular:karma",
-      "options": {
-        "polyfills": [
-          "zone.js",
-          "zone.js/testing"
-        ],
-        "tsConfig": "{workspaceRoot}/tsconfig.spec.json",
-        "inlineStyleLanguage": "scss",
-        "assets": [
-          "projects/ngx-image-compress-demo/src/assets/favicons/favicon.ico",
-          "projects/ngx-image-compress-demo/src/assets"
-        ],
-        "styles": [
-          "projects/ngx-image-compress-demo/src/styles.scss"
-        ],
-        "scripts": []
-      }
-    },
-    "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "projects/ngx-image-compress-demo/src/**/*.ts",
-          "projects/ngx-image-compress-demo/src/**/*.html"
-        ]
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
     }
-  }
 }
diff --git a/projects/ngx-image-compress-demo/src/app/app.component.spec.ts b/projects/ngx-image-compress-demo/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DataUrl, NgxImageCompressService } from 'ngx-image-compress';
-import { DOC_ORIENTATION } from '../../projects/ngx-image-compress/src/lib/models/DOC_ORIENTATION';
+import { DOC_ORIENTATION } from 'projects/ngx-image-compress/src/lib/models/DOC_ORIENTATION';
 import { AppComponent } from './app.component';
 
 const testDataUrl: DataUrl =

diff --git a/projects/ngx-image-compress/project.json b/projects/ngx-image-compress/project.json
@@ -1,49 +1,42 @@
 {
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "name": "ngx-image-compress",
-  "projectType": "library",
-  "sourceRoot": "projects/ngx-image-compress/src",
-  "prefix": "lib",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:ng-packagr",
-      "options": {
-        "project": "projects/ngx-image-compress/ng-package.json"
-      },
-      "configurations": {
-        "production": {
-          "tsConfig": "projects/ngx-image-compress/tsconfig.lib.prod.json"
+    "$schema": "../../node_modules/nx/schemas/project-schema.json",
+    "name": "ngx-image-compress",
+    "projectType": "library",
+    "sourceRoot": "projects/ngx-image-compress/src",
+    "prefix": "lib",
+    "targets": {
+        "build": {
+            "executor": "@angular-devkit/build-angular:ng-packagr",
+            "options": {
+                "project": "projects/ngx-image-compress/ng-package.json"
+            },
+            "configurations": {
+                "production": {
+                    "tsConfig": "projects/ngx-image-compress/tsconfig.lib.prod.json"
+                },
+                "development": {
+                    "tsConfig": "projects/ngx-image-compress/tsconfig.lib.json"
+                }
+            },
+            "defaultConfiguration": "production",
+            "outputs": ["{workspaceRoot}/dist/ngx-image-compress"]
         },
-        "development": {
-          "tsConfig": "projects/ngx-image-compress/tsconfig.lib.json"
+        "test": {
+            "executor": "@angular-devkit/build-angular:karma",
+            "options": {
+                "polyfills": ["zone.js", "zone.js/testing"],
+                "codeCoverage": true,
+                "browsers": "ChromeHeadless",
+                "progress": true,
+                "tsConfig": "tsconfig.spec.json"
+            }
+        },
+        "lint": {
+            "executor": "@angular-eslint/builder:lint",
+            "options": {
+                "lintFilePatterns": ["projects/ngx-image-compress/src/**/*.ts", "projects/ngx-image-compress/src/**/*.html"]
+            },
+            "outputs": ["{options.outputFile}"]
         }
-      },
-      "defaultConfiguration": "production",
-      "outputs": [
-        "{workspaceRoot}/dist/ngx-image-compress"
-      ]
-    },
-    "test": {
-      "executor": "@angular-devkit/build-angular:karma",
-      "options": {
-        "polyfills": [
-          "zone.js",
-          "zone.js/testing"
-        ],
-        "tsConfig": "{workspaceRoot}/tsconfig.spec.json"
-      }
-    },
-    "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "projects/ngx-image-compress/src/**/*.ts",
-          "projects/ngx-image-compress/src/**/*.html"
-        ]
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
     }
-  }
 }
diff --git a/scripts/convert-assets-to-data-urls.js b/scripts/convert-assets-to-data-urls.js
@@ -1,6 +1,6 @@
 const fs = require("fs");
 
-const dirAssets = `./src/assets/tests-images`;
+const dirAssets = `./projects/ngx-image-compress-demo/src/assets/tests-images`;
 const targetFile = `./projects/ngx-image-compress/src/tests/sample-images-data-urls.spec.ts`;
 
 const dirList = fs.readdirSync(dirAssets);

diff --git a/tsconfig.spec.json b/tsconfig.spec.json
@@ -5,5 +5,5 @@
         "outDir": "./out-tsc/spec",
         "types": ["jasmine"]
     },
-    "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+    "include": ["projects/**/*.spec.ts", "projects/**/*.d.ts"]
 }