Skip to content
This repository has been archived by the owner on Mar 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #53 from Arquisoft/Nacho
Browse files Browse the repository at this point in the history
Nacho
  • Loading branch information
Nacho888 committed Mar 28, 2019
2 parents 863b6f1 + e5d6fff commit e44b3ad
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 27 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ install:
- npm install

script:
- npm run setup:install
- npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
- npm run e2e
- npm run docs:build
Expand Down
11 changes: 8 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,13 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
}
],
"codeCoverageExclude": [
"src/app/services/auth.guard.service.ts",
"src/app/services/rdf.service.ts",
"src/app/services/solid.auth.service.ts"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
Expand Down Expand Up @@ -162,4 +167,4 @@
}
},
"defaultProject": "solid-app"
}
}
22 changes: 4 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"docs:prepare": "npm install gitbook-cli -g && gitbook install",
"docs:watch": "npm run docs:prepare && gitbook serve ./_docs ./docs --open",
"docs:build": "npm run docs:prepare && gitbook build ./_docs ./docs",
"setup:install": "npm install && npm install -g @angular/cli && npm install coveralls --save-dev",
"extract-i18n": "ng xi18n solid-app --i18n-format xlf --output-path locale --i18n-locale en && ng run solid-app:xliffmerge",
"start-en": "ng serve --configuration=en",
"cucumber": "cucumber-js"
Expand All @@ -34,12 +33,9 @@
"@angular/platform-browser-dynamic": "^6.0.3",
"@angular/router": "^6.1.4",
"@fortawesome/fontawesome-free": "^5.7.2",
"@ng-bootstrap/ng-bootstrap": "^4.1.0",
"@ng-select/ng-select": "^2.5.1",
"@ngx-i18nsupport/tooling": "^1.1.2",
"@types/chart.js": "^2.7.48",
"angular-bootstrap-md": "^7.4.3",
"bootstrap": "^4.0.0-alpha.6",
"chart.js": "^2.5.0",
"core-js": "^2.5.4",
"crypto-js": "^3.1.9-1",
Expand Down
3 changes: 2 additions & 1 deletion src/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = function (config) {
flags: ["--no-sandbox"]
}
},
singleRun: false
singleRun: false,
exclude: ["./app/services/(auth.guard.service.ts|chat.service.ts|rdf.service.ts|solid.auth.service.ts)"],
});
};

0 comments on commit e44b3ad

Please sign in to comment.