Commit b7e460b9fda033eea2069eceddbee0f4f48b5124
Exists in
master
Merge branch 'master' into 'master'
Master(efernandez) See merge request !73
Showing
4 changed files
Show diff stats
index.html
| ... | ... | @@ -39,7 +39,6 @@ |
| 39 | 39 | <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script> |
| 40 | 40 | |
| 41 | 41 | <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script> |
| 42 | - <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script> | |
| 43 | 42 | <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> |
| 44 | 43 | <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script> |
| 45 | 44 | <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script> |
package.json
| ... | ... | @@ -20,16 +20,17 @@ |
| 20 | 20 | "author": "Foca Software", |
| 21 | 21 | "license": "ISC", |
| 22 | 22 | "dependencies": { |
| 23 | - "angular": "^1.7.5", | |
| 23 | + "angular": "^1.7.7", | |
| 24 | 24 | "angular-chart.js": "1.1.1", |
| 25 | - "angular-cookies": "^1.7.5", | |
| 26 | - "angular-i18n": "^1.7.5", | |
| 25 | + "angular-cookies": "^1.7.7", | |
| 26 | + "angular-i18n": "^1.7.7", | |
| 27 | 27 | "angular-ladda": "^0.4.3", |
| 28 | - "angular-route": "^1.7.5", | |
| 29 | - "angular-sanitize": "^1.7.5", | |
| 28 | + "angular-mocks": "^1.7.7", | |
| 29 | + "angular-route": "^1.7.7", | |
| 30 | + "angular-sanitize": "^1.7.7", | |
| 30 | 31 | "angular-ui-grid": "4.6.6", |
| 31 | 32 | "angular-ui-swiper": "^2.3.8", |
| 32 | - "bootstrap": "^4.1.3", | |
| 33 | + "bootstrap": "^4.2.1", | |
| 33 | 34 | "chart.js": "2.7.3", |
| 34 | 35 | "excel-builder": "2.0.3", |
| 35 | 36 | "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git", |
| ... | ... | @@ -87,7 +88,7 @@ |
| 87 | 88 | "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git", |
| 88 | 89 | "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git", |
| 89 | 90 | "font-awesome": "^4.7.0", |
| 90 | - "gulp-angular-templatecache": "^2.2.1", | |
| 91 | + "gulp-angular-templatecache": "^2.2.6", | |
| 91 | 92 | "gulp-htmlmin": "^5.0.1", |
| 92 | 93 | "gulp-uglify": "^3.0.1", |
| 93 | 94 | "gulp-uglify-es": "^1.0.4", |
| ... | ... | @@ -98,24 +99,24 @@ |
| 98 | 99 | "lodash": "4.17.11", |
| 99 | 100 | "moment": "2.23.0", |
| 100 | 101 | "ngstorage": "^0.3.11", |
| 101 | - "node-sass": "^4.10.0", | |
| 102 | + "node-sass": "^4.11.0", | |
| 102 | 103 | "pdfmake": "0.1.41", |
| 103 | 104 | "uglify": "^0.1.5", |
| 104 | - "ui-bootstrap4": "^3.0.5" | |
| 105 | + "ui-bootstrap4": "^3.0.6" | |
| 105 | 106 | }, |
| 106 | 107 | "devDependencies": { |
| 107 | 108 | "gulp": "3.9.1", |
| 108 | 109 | "gulp-clean": "^0.4.0", |
| 109 | 110 | "gulp-concat": "^2.6.1", |
| 110 | - "gulp-connect": "^5.6.1", | |
| 111 | + "gulp-connect": "^5.7.0", | |
| 111 | 112 | "gulp-jshint": "^2.1.0", |
| 112 | 113 | "gulp-rename": "^1.4.0", |
| 113 | 114 | "gulp-replace": "^1.0.0", |
| 114 | 115 | "gulp-sass": "^4.0.1", |
| 115 | 116 | "gulp-uglify": "^1.0.4", |
| 116 | 117 | "gulp-watch": "^5.0.1", |
| 117 | - "jasmine-core": "^3.2.1", | |
| 118 | - "jshint": "^2.9.6", | |
| 118 | + "jasmine-core": "^3.3.0", | |
| 119 | + "jshint": "^2.10.1", | |
| 119 | 120 | "pre-commit": "^1.2.2", |
| 120 | 121 | "pump": "^3.0.0" |
| 121 | 122 | } |
src/js/app.js
unit-test.html
| ... | ... | @@ -0,0 +1,19 @@ |
| 1 | +<html> | |
| 2 | + <head> | |
| 3 | + <link rel="stylesheet" type="text/css" href="node_modules/jasmine-core/lib/jasmine-core/jasmine.css"> | |
| 4 | + <meta charset="UTF-8" /> | |
| 5 | + </head> | |
| 6 | + <body> | |
| 7 | + <script src="node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script> | |
| 8 | + <script src="node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script> | |
| 9 | + <script src="node_modules/jasmine-core/lib/jasmine-core/boot.js"></script> | |
| 10 | + <script src="node_modules/angular/angular.min.js"></script> | |
| 11 | + <script src="node_modules/angular-mocks/angular-mocks.js"></script> | |
| 12 | + <script src="node_modules/angular-route/angular-route.min.js"></script> | |
| 13 | + | |
| 14 | + <!-- foca-abm-vehiculo --> | |
| 15 | + <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script> | |
| 16 | + <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.spec.js"></script> | |
| 17 | + | |
| 18 | + </body> | |
| 19 | +</html> |