diff --git a/DynamicBibleIonic/karma.conf.js b/DynamicBibleIonic/karma.conf.js index 2e67b8af..be5a2ed0 100644 --- a/DynamicBibleIonic/karma.conf.js +++ b/DynamicBibleIonic/karma.conf.js @@ -2,41 +2,41 @@ module.exports = function (config) { config.set({ basePath: '', - frameworks: ['jasmine', 'angular-cli'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-remap-istanbul'), - require('karma-mocha-reporter'), - require('angular-cli/plugins/karma') - ], + frameworks: ['jasmine', 'karma-typescript'], + files: [ - { pattern: './src/**/*.spec.ts', watched: false } + './src/**/*.spec.ts' ], + + exclude: [ + ], + preprocessors: { - './src/**/*.spec.ts': ['angular-cli'] + './src/**/*.spec.ts': ['karma-typescript'] }, - mime: { - 'text/x-typescript': ['ts', 'tsx'] - }, - remapIstanbulReporter: { - reports: { - html: 'coverage', - lcovonly: './coverage/coverage.lcov' + + typescriptPreprocessor: { + options: { + sourceMap: false, + target: 'ES5', + module: 'amd', + noImplicitAny: true, + noResolve: true, + removeComments: true, + concatenateOutput: false + }, + transformPath: function (path) + { + return path.replace(/\.ts$/, '.js'); } }, - angularCli: { - config: './angular-cli.json', - environment: 'dev' - }, - reporters: config.angularCli && config.angularCli.codeCoverage - ? ['mocha', 'karma-remap-istanbul'] - : ['mocha'], + reporters: ['progress', 'karma-typescript'], port: 9876, colors: true, - logLevel: config.LOG_INFO, + logLevel: config.LOG_DEBUG, autoWatch: true, browsers: ['Chrome'], - singleRun: false - }); -}; \ No newline at end of file + singleRun: false, + concurrency: Infinity + }) +} \ No newline at end of file diff --git a/DynamicBibleIonic/package.json b/DynamicBibleIonic/package.json index edf0a4ab..bf4f7463 100644 --- a/DynamicBibleIonic/package.json +++ b/DynamicBibleIonic/package.json @@ -12,7 +12,7 @@ "build": "ionic-app-scripts build", "ionic:build": "ionic-app-scripts build", "ionic:serve": "ionic-app-scripts serve", - "test": "ng test --code-coverage" + "test": "karma start karma.conf.js" }, "dependencies": { "@angular/common": "2.2.1", @@ -25,32 +25,22 @@ "@angular/platform-browser-dynamic": "2.2.1", "@angular/platform-server": "2.2.1", "@ionic/storage": "1.1.7", + "@types/jasmine": "^2.5.38", "ionic-angular": "2.0.0-rc.4", "ionic-native": "2.2.11", "ionicons": "3.0.0", + "jasmine-core": "^2.5.2", + "karma": "^1.3.0", + "karma-chrome-launcher": "^2.0.0", + "karma-jasmine": "^1.1.0", + "karma-typescript": "^2.1.5", "rxjs": "5.0.0-beta.12", "zone.js": "0.6.26" }, "devDependencies": { "@ionic/app-scripts": "0.0.47", "karma": "^1.3.0", - "typescript": "2.0.9", - "@types/jasmine": "2.5.38", - "@types/node": "6.0.42", - "angular-cli": "1.0.0-beta.24", - "codecov": "1.0.1", - "jasmine-core": "2.5.2", - "jasmine-spec-reporter": "2.7.0", - "karma-chrome-launcher": "2.0.0", - "karma-cli": "1.0.1", - "karma-jasmine": "1.1.0", - "karma-mocha-reporter": "2.2.1", - "karma-remap-istanbul": "0.2.2", - "protractor": "4.0.13", - "protractor-jasmine2-screenshot-reporter": "0.3.2", - "ts-node": "1.7.2", - "tslint": "4.1.1", - "tslint-eslint-rules": "3.2.0" + "typescript": "2.0.9" }, "cordovaPlugins": [ "cordova-plugin-whitelist", diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts index 8f6a24f4..b272f384 100644 --- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts +++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts @@ -10,7 +10,7 @@ export class StrongsModal { item: StrongsResult; @Output() - onPassageClicked = new EventEmitter(); + onPassageClicked = new EventEmitter(); constructor( public platform: Platform, diff --git a/DynamicBibleIonic/src/components/words/words.scss b/DynamicBibleIonic/src/components/words/words.scss index e8cfe2aa..c9c4e6c2 100644 --- a/DynamicBibleIonic/src/components/words/words.scss +++ b/DynamicBibleIonic/src/components/words/words.scss @@ -1,7 +1,7 @@  words ion-scroll { white-space: nowrap; - height: 250px; + height: 200px; } ion-col .button{