fixing tests and cleaning up packages

karma.conf.js

@@ -1,5 +1,5 @@
 // Karma configuration file, see link for more information
-// https://karma-runner.github.io/0.13/config/configuration-file.html
+// https://karma-runner.github.io/1.0/config/configuration-file.html
 
 module.exports = function (config) {
   config.set({
@@ -9,18 +9,28 @@ module.exports = function (config) {
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
+      require('karma-coverage'),
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
-    coverageIstanbulReporter: {
+    jasmineHtmlReporter: {
-      dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly'],
+      suppressAll: true // removes the duplicated traces
-      fixWebpackSourcePaths: true
     },
-    angularCli: {
+    coverageReporter: {
-      environment: 'dev'
+      dir: require('path').join(__dirname, 'coverage'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' }
+      ]
     },
     reporters: ['progress', 'kjhtml'],
     port: 9876,

package.json

@@ -99,7 +99,7 @@
     "chai-http": "4.3.0",
     "codelyzer": "6.0.2",
     "core-js": "3.21.1",
-    "coveralls": "3.1.1",
+    "coveralls": "^3.1.1",
     "deep-equal-in-any-order": "1.1.15",
     "ejs-loader": "0.5.0",
     "gulp": "4.0.2",
@@ -109,37 +109,31 @@
     "hammerjs": "2.0.8",
     "intl": "1.2.5",
     "jasmine-core": "4.0.1",
-    "jasmine-spec-reporter": "7.0.0",
     "jw-bootstrap-switch-ng2": "2.0.5",
     "karma": "6.3.17",
     "karma-chrome-launcher": "3.1.1",
-    "karma-cli": "2.0.0",
+    "karma-coverage": "2.2.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-jasmine": "4.0.2",
-    "karma-jasmine": "4.0.1",
     "karma-jasmine-html-reporter": "1.7.0",
-    "karma-remap-istanbul": "0.6.0",
-    "karma-systemjs": "0.16.0",
     "leaflet": "1.7.1",
     "leaflet.markercluster": "1.5.3",
     "mocha": "9.2.2",
     "ngx-bootstrap": "6.2.0",
     "ngx-clipboard": "14.0.2",
     "ngx-cookie-service": "12.0.3",
-    "ngx-markdown": "12.1.0",
     "ngx-device-detector": "3.0.0",
+    "ngx-markdown": "12.1.0",
     "ngx-toastr": "12.1.0",
     "nyc": "15.1.0",
     "open-iconic": "1.1.1",
-    "protractor": "7.0.0",
-    "remap-istanbul": "0.13.0",
     "rxjs": "6.6.7",
     "rxjs-compat": "6.6.7",
     "ts-helpers": "1.1.2",
     "ts-node": "10.7.0",
     "tslint": "6.1.3",
-    "xlf-google-translate": "1.0.0-beta.22",
     "web-animations-js": "2.3.2",
     "webpack-bundle-analyzer": "4.5.0",
+    "xlf-google-translate": "1.0.0-beta.22",
     "xml2js": "0.4.23",
     "zone.js": "0.11.5"
   },

protractor.conf.js

@@ -1,29 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const {SpecReporter} = require('jasmine-spec-reporter');
-
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './test/e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    'browserName': 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function () {
-    }
-  },
-  onPrepare() {
-    require('ts-node').register({
-      project: 'test/e2e/tsconfig.e2e.json'
-    });
-    jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
-  }
-};

src/backend/model/database/sql/SearchManager.ts

@@ -90,7 +90,7 @@ export class SearchManager implements ISQLSearchManager {
     if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.person) {
       partialResult.push(this.encapsulateAutoComplete((await personRepository
         .createQueryBuilder('person')
-        .select('DISTINCT(person.name)')
+        .select('DISTINCT(person.name), person.count')
         .where('person.name LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
         .limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
         .orderBy('person.count', 'DESC')

test/backend/unit/model/sql/IndexingManager.spec.ts

@@ -411,8 +411,8 @@ describe('IndexingManager', (sqlHelper: DBTestHelper) => {
     const parent = TestHelper.getRandomizedDirectoryEntry();
     const p1 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo1');
     const p2 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo2');
-    const minFloat = 1.1 * Math.pow(10, -38);
+    const minFloat = parseFloat((1.1 * Math.pow(10, -38)).toFixed(10));
-    const maxFloat = 3.4 * Math.pow(10, +38);
+    const maxFloat = parseFloat((3.4 * Math.pow(10, +38)).toFixed(10));
     p1.metadata.cameraData.fStop = minFloat;
     p2.metadata.cameraData.fStop = maxFloat;
     p1.metadata.cameraData.exposure = minFloat;
@@ -561,7 +561,7 @@ describe('IndexingManager', (sqlHelper: DBTestHelper) => {
 
     await im.resetDB();
     const selectReset = await gm.selectParentDir(conn, parent.name, parent.path);
-    expect(selectReset).to.deep.equal(undefined);
+    expect(selectReset).to.deep.equal(null);
   });