mirror of
https://gitlab.com/walljm/dynamicbible.git
synced 2025-07-25 16:29:49 -04:00
FIX: Reverted back to original karma/jasmine setup which works... sort of
* fixed bug in strongs modal
This commit is contained in:
parent
b60e2de7cf
commit
1c41a826c7
@ -2,41 +2,41 @@ module.exports = function (config)
|
|||||||
{
|
{
|
||||||
config.set({
|
config.set({
|
||||||
basePath: '',
|
basePath: '',
|
||||||
frameworks: ['jasmine', 'angular-cli'],
|
frameworks: ['jasmine', 'karma-typescript'],
|
||||||
plugins: [
|
|
||||||
require('karma-jasmine'),
|
|
||||||
require('karma-chrome-launcher'),
|
|
||||||
require('karma-remap-istanbul'),
|
|
||||||
require('karma-mocha-reporter'),
|
|
||||||
require('angular-cli/plugins/karma')
|
|
||||||
],
|
|
||||||
files: [
|
files: [
|
||||||
{ pattern: './src/**/*.spec.ts', watched: false }
|
'./src/**/*.spec.ts'
|
||||||
],
|
],
|
||||||
|
|
||||||
|
exclude: [
|
||||||
|
],
|
||||||
|
|
||||||
preprocessors: {
|
preprocessors: {
|
||||||
'./src/**/*.spec.ts': ['angular-cli']
|
'./src/**/*.spec.ts': ['karma-typescript']
|
||||||
},
|
},
|
||||||
mime: {
|
|
||||||
'text/x-typescript': ['ts', 'tsx']
|
typescriptPreprocessor: {
|
||||||
},
|
options: {
|
||||||
remapIstanbulReporter: {
|
sourceMap: false,
|
||||||
reports: {
|
target: 'ES5',
|
||||||
html: 'coverage',
|
module: 'amd',
|
||||||
lcovonly: './coverage/coverage.lcov'
|
noImplicitAny: true,
|
||||||
|
noResolve: true,
|
||||||
|
removeComments: true,
|
||||||
|
concatenateOutput: false
|
||||||
|
},
|
||||||
|
transformPath: function (path)
|
||||||
|
{
|
||||||
|
return path.replace(/\.ts$/, '.js');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
angularCli: {
|
reporters: ['progress', 'karma-typescript'],
|
||||||
config: './angular-cli.json',
|
|
||||||
environment: 'dev'
|
|
||||||
},
|
|
||||||
reporters: config.angularCli && config.angularCli.codeCoverage
|
|
||||||
? ['mocha', 'karma-remap-istanbul']
|
|
||||||
: ['mocha'],
|
|
||||||
port: 9876,
|
port: 9876,
|
||||||
colors: true,
|
colors: true,
|
||||||
logLevel: config.LOG_INFO,
|
logLevel: config.LOG_DEBUG,
|
||||||
autoWatch: true,
|
autoWatch: true,
|
||||||
browsers: ['Chrome'],
|
browsers: ['Chrome'],
|
||||||
singleRun: false
|
singleRun: false,
|
||||||
});
|
concurrency: Infinity
|
||||||
};
|
})
|
||||||
|
}
|
@ -12,7 +12,7 @@
|
|||||||
"build": "ionic-app-scripts build",
|
"build": "ionic-app-scripts build",
|
||||||
"ionic:build": "ionic-app-scripts build",
|
"ionic:build": "ionic-app-scripts build",
|
||||||
"ionic:serve": "ionic-app-scripts serve",
|
"ionic:serve": "ionic-app-scripts serve",
|
||||||
"test": "ng test --code-coverage"
|
"test": "karma start karma.conf.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/common": "2.2.1",
|
"@angular/common": "2.2.1",
|
||||||
@ -25,32 +25,22 @@
|
|||||||
"@angular/platform-browser-dynamic": "2.2.1",
|
"@angular/platform-browser-dynamic": "2.2.1",
|
||||||
"@angular/platform-server": "2.2.1",
|
"@angular/platform-server": "2.2.1",
|
||||||
"@ionic/storage": "1.1.7",
|
"@ionic/storage": "1.1.7",
|
||||||
|
"@types/jasmine": "^2.5.38",
|
||||||
"ionic-angular": "2.0.0-rc.4",
|
"ionic-angular": "2.0.0-rc.4",
|
||||||
"ionic-native": "2.2.11",
|
"ionic-native": "2.2.11",
|
||||||
"ionicons": "3.0.0",
|
"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",
|
"rxjs": "5.0.0-beta.12",
|
||||||
"zone.js": "0.6.26"
|
"zone.js": "0.6.26"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ionic/app-scripts": "0.0.47",
|
"@ionic/app-scripts": "0.0.47",
|
||||||
"karma": "^1.3.0",
|
"karma": "^1.3.0",
|
||||||
"typescript": "2.0.9",
|
"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"
|
|
||||||
},
|
},
|
||||||
"cordovaPlugins": [
|
"cordovaPlugins": [
|
||||||
"cordova-plugin-whitelist",
|
"cordova-plugin-whitelist",
|
||||||
|
@ -10,7 +10,7 @@ export class StrongsModal {
|
|||||||
item: StrongsResult;
|
item: StrongsResult;
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
onPassageClicked = new EventEmitter<OpenData>();
|
onPassageClicked = new EventEmitter<string>();
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public platform: Platform,
|
public platform: Platform,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
words ion-scroll {
|
words ion-scroll {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
height: 250px;
|
height: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
ion-col .button{
|
ion-col .button{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user