From 66fa1497c9b8d23cfede5373d9de0ed47a390506 Mon Sep 17 00:00:00 2001 From: ali badakhshan Date: Mon, 8 Apr 2019 17:48:33 +0430 Subject: [PATCH] fix some errors --- angular.json | 2 +- e2e/protractor.conf.js | 22 +++++++++++----------- src/karma.conf.js | 27 +++++++++++++++------------ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/angular.json b/angular.json index d182825..2caba2b 100644 --- a/angular.json +++ b/angular.json @@ -41,7 +41,7 @@ "node_modules/ionicons/scss/ionicons.scss", "node_modules/ngx-toastr/toastr.css", "src/styles/styles.scss", - "node_modules/narik-ui-material/styles/narik-ui-material.css", + "node_modules/narik-ui-material/styles/narik-ui-material.css" ], "stylePreprocessorOptions": { "includePaths": [ diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 86776a3..d60eff0 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -1,28 +1,28 @@ // Protractor configuration file, see link for more information // https://github.com/angular/protractor/blob/master/lib/config.ts -const { SpecReporter } = require('jasmine-spec-reporter'); +const { SpecReporter } = require("jasmine-spec-reporter"); exports.config = { allScriptsTimeout: 11000, - specs: [ - './src/**/*.e2e-spec.ts' - ], + specs: ["./src/**/*.e2e-spec.ts"], capabilities: { - 'browserName': 'chrome' + browserName: "chrome" }, directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', + baseUrl: "http://localhost:4200/", + framework: "jasmine", jasmineNodeOpts: { showColors: true, defaultTimeoutInterval: 30000, print: function() {} }, onPrepare() { - require('ts-node').register({ - project: require('path').join(__dirname, './tsconfig.e2e.json') + require("ts-node").register({ + project: require("path").join(__dirname, "./tsconfig.e2e.json") }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + jasmine + .getEnv() + .addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); } -}; \ No newline at end of file +}; diff --git a/src/karma.conf.js b/src/karma.conf.js index b3837bc..1bdf279 100644 --- a/src/karma.conf.js +++ b/src/karma.conf.js @@ -1,31 +1,34 @@ // Karma configuration file, see link for more information // https://karma-runner.github.io/1.0/config/configuration-file.html -module.exports = function (config) { +module.exports = function(config) { config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], + basePath: "", + frameworks: ["jasmine", "@angular-devkit/build-angular"], plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma') + require("karma-jasmine"), + require("karma-chrome-launcher"), + require("karma-jasmine-html-reporter"), + require("karma-coverage-istanbul-reporter"), + require("@angular-devkit/build-angular/plugins/karma") ], client: { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: require('path').join(__dirname, '../coverage/narik-material-starter'), - reports: ['html', 'lcovonly', 'text-summary'], + dir: require("path").join( + __dirname, + "../coverage/narik-material-starter" + ), + reports: ["html", "lcovonly", "text-summary"], fixWebpackSourcePaths: true }, - reporters: ['progress', 'kjhtml'], + reporters: ["progress", "kjhtml"], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['Chrome'], + browsers: ["Chrome"], singleRun: false, restartOnFileChange: true });