diff --git a/.travis.yml b/.travis.yml index ff9e48637b..6faf755c2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ jdk: - oraclejdk8 env: - - DOCKER_COMPOSE_VERSION=1.14.0 WHEREHOWS_DIR=wherehows-web + - DOCKER_COMPOSE_VERSION=1.14.0 services: - docker @@ -44,10 +44,9 @@ cache: script: - ./gradlew check assemble -- ./gradlew jacocoFullReport coveralls +- ./gradlew jacocoFullReport coveralls && ./gradlew wherehows-frontend:emberCoverage - (cd wherehows-docker && ./build.sh latest) - (cd wherehows-docker && docker-compose config) -- (cd $WHEREHOWS_DIR && yarn install --non-interactive && node_modules/bower/bin/bower install && npm run-script coverage) after_script: - rm -rf $WHEREHOWS_DIR/coverage diff --git a/wherehows-web/ember-cli-build.js b/wherehows-web/ember-cli-build.js index 75004833ce..d4e9cf23b0 100644 --- a/wherehows-web/ember-cli-build.js +++ b/wherehows-web/ember-cli-build.js @@ -89,14 +89,12 @@ module.exports = function(defaults) { // along with the exports of each module as its value. app.import('bower_components/jquery-ui/themes/base/jquery-ui.css'); - // app.import('bower_components/jquery.fancytree/dist/skin-win8/ui.fancytree.min.css'); app.import('vendor/fancytree/src/skin-wherehows/ui.wherehows.css'); app.import('bower_components/font-awesome/css/font-awesome.min.css'); app.import('bower_components/json-human/css/json.human.css'); app.import('bower_components/jquery-treegrid/css/jquery.treegrid.css'); app.import('bower_components/toastr/toastr.min.css'); app.import('bower_components/jquery-jsonview/dist/jquery.jsonview.css'); - // app.import('bower_components/bootstrap/dist/css/bootstrap.min.css'); app.import('bower_components/jsondiffpatch/public/formatters-styles/html.css'); app.import('bower_components/jsondiffpatch/public/formatters-styles/annotated.css'); app.import('bower_components/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css'); @@ -122,8 +120,6 @@ module.exports = function(defaults) { app.import('vendor/dagre-d3/js/tipsy.js'); app.import('vendor/dagre-d3/js/jquery.contextMenu.js'); app.import('vendor/d3pie-0.18/d3pie-customized.js'); - // app.import('bower_components/jquery.fancytree/dist/jquery.fancytree.min.js'); - // app.import('bower_components/jquery.fancytree/dist/src/jquery.fancytree.filter.js'); app.import('bower_components/jquery.scrollTo/jquery.scrollTo.min.js'); app.import('bower_components/jquery-treegrid/js/jquery.treegrid.js'); app.import('bower_components/json-human/src/json.human.js');